Merge branch 'master' into 1.4

Conflicts:
	limereport/items/lrtextitem.cpp
	limereport/lrreportdesignwidget.cpp
This commit is contained in:
Arin Alex
2016-08-02 01:43:05 +03:00
8 changed files with 66 additions and 33 deletions

View File

@@ -812,7 +812,9 @@ BandDesignIntf* ReportRender::sliceBand(BandDesignIntf *band, BandDesignIntf* pa
band = saveUppperPartReturnBottom(band,m_maxHeightByColumn[m_currentColumn],patternBand);
if (!band->isEmpty()) {
if (band->autoHeight()){
band->setHeight(0);
if (band->isNeedUpdateSize(FirstPass)){
band->setHeight(0);
}
band->updateItemSize(m_datasources);
}
DataBandDesignIntf* data = dynamic_cast<DataBandDesignIntf*>(band);