0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00

Finish 1.4.82

# Conflicts:
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2018-06-20 16:45:38 +03:00
3 changed files with 100 additions and 3 deletions

View File

@@ -603,7 +603,8 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
firstTime = false;
}
m_reprintableBands.removeOne(header);
if (!dataBand->keepFooterTogether())
m_reprintableBands.removeOne(header);
if (header) recalcIfNeeded(header);
if (bandDatasource->prior()){
@@ -611,8 +612,11 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
bandDatasource->next();
}
if (footer && !footer->printAlways())
if (footer && !footer->printAlways()){
renderBand(footer, 0, StartNewPageAsNeeded);
if (dataBand->keepFooterTogether())
m_reprintableBands.removeOne(dataBand);
}
datasources()->deleteVariable(varName);
@@ -620,8 +624,11 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
renderBand(dataBand, 0, StartNewPageAsNeeded);
}
if (footer && footer->printAlways())
if (footer && footer->printAlways()){
renderBand(footer, 0, StartNewPageAsNeeded);
if (dataBand->keepFooterTogether())
m_reprintableBands.removeOne(dataBand);
}
}
void ReportRender::renderPageHeader(PageItemDesignIntf *patternPage)