python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-11-07 00:41:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2016-09-18 12:26:48 +04:00
parent f1e0be4a91 7c4d3bf8da
commit 2b63fa1149
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrreportrender.h
View File

@@ -88,6 +88,7 @@ public slots:
private:
void renderPage(PageDesignIntf *patternPage);
void initDatasources();
void initDatasource(const QString &name);
void initRenderPage();
#ifdef HAVE_UI_LOADER
void initDialogs();
@@ -177,6 +178,7 @@ private:
QList<PagesRange> m_ranges;
QVector<BandDesignIntf*> m_columnedBandItems;
unsigned long long m_curentNameIndex;
};
} // namespace LimeReport
#endif // LRREPORTRENDER_H