mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Finish 1.4.60
This commit is contained in:
commit
567228325d
@ -148,7 +148,7 @@ void ReportRender::renameChildItems(BaseDesignIntf *item){
|
||||
|
||||
ReportRender::ReportRender(QObject *parent)
|
||||
:QObject(parent), m_renderPageItem(0), m_pageCount(0),
|
||||
m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0)
|
||||
m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0), m_newPageStarted(false)
|
||||
{
|
||||
initColumns();
|
||||
}
|
||||
@ -558,6 +558,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
|
||||
renderBand(header, 0, StartNewPageAsNeeded);
|
||||
|
||||
renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext());
|
||||
m_newPageStarted = false;
|
||||
renderChildBands(dataBand);
|
||||
|
||||
}
|
||||
@ -729,7 +730,7 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
|
||||
}
|
||||
gb->startGroup(m_datasources);
|
||||
openDataGroup(band);
|
||||
if (!firstTime && gb->startNewPage()){
|
||||
if (!firstTime && gb->startNewPage() && !m_newPageStarted){
|
||||
if (gb->resetPageNumber()) resetPageNumber(BandReset);
|
||||
if (band->reprintOnEachPage()){
|
||||
savePage();
|
||||
@ -1085,8 +1086,9 @@ void ReportRender::startNewColumn(){
|
||||
|
||||
void ReportRender::startNewPage()
|
||||
{
|
||||
m_renderPageItem=0;
|
||||
m_currentColumn=0;
|
||||
m_renderPageItem = 0;
|
||||
m_currentColumn = 0;
|
||||
m_newPageStarted = true;
|
||||
|
||||
initColumns();
|
||||
initRenderPage();
|
||||
|
@ -185,6 +185,7 @@ private:
|
||||
QList<PagesRange> m_ranges;
|
||||
QVector<BandDesignIntf*> m_columnedBandItems;
|
||||
unsigned long long m_curentNameIndex;
|
||||
bool m_newPageStarted;
|
||||
|
||||
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user