Merge branch 'master' into 1.4

Conflicts:
	limereport/items/lrtextitem.cpp
	limereport/items/lrtextitem.h
This commit is contained in:
Arin Alex
2016-07-27 00:44:50 +03:00
8 changed files with 134 additions and 9 deletions

View File

@@ -441,6 +441,9 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
datasources()->updateChildrenData(dataBand->datasourceName());
m_lastDataBand = dataBand;
if (header && !firstTime && header->repeatOnEachRow())
renderBand(header,StartNewPageAsNeeded);
renderBand(dataBand,StartNewPageAsNeeded,!bandDatasource->hasNext());
renderChildBands(dataBand);