mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander 2016-07-15 11:44:13 +03:00
commit 378ed68ec1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
limereport/lrpageitemdesignintf.cpp
View File

@ -200,9 +200,10 @@ int PageItemDesignIntf::calcBandIndex(BandDesignIntf::BandsType bandType, BandDe
qSort(m_bands.begin(),m_bands.end(),bandSortBandLessThenByIndex); qSort(m_bands.begin(),m_bands.end(),bandSortBandLessThenByIndex);
foreach(BandDesignIntf* band,m_bands){ foreach(BandDesignIntf* band,m_bands){
if ((band->bandType()==BandDesignIntf::GroupHeader)&&(band->bandType()>bandType)) break; if ((band->bandType()==BandDesignIntf::GroupHeader)&&(band->bandType()>bandType)) break;
if ((band->bandType()>bandType)) break; if ((band->bandType()<=bandType)){
if (bandIndex<=band->bandIndex()) bandIndex=band->maxChildIndex()+1; if (bandIndex<=band->bandIndex()) bandIndex=band->maxChildIndex()+1;
} }
}
if (bandIndex==-1) { if (bandIndex==-1) {
bandIndex = (int)(bandType); bandIndex = (int)(bandType);
@ -218,7 +219,7 @@ int PageItemDesignIntf::calcBandIndex(BandDesignIntf::BandsType bandType, BandDe
switch (bandType) { switch (bandType) {
case BandDesignIntf::SubDetailBand: case BandDesignIntf::SubDetailBand:
bandIndex = parentBand->bandIndex() + 1; bandIndex = parentBand->maxChildIndex() + 1;
increaseBandIndex = true; increaseBandIndex = true;
break; break;
case BandDesignIntf::SubDetailHeader: case BandDesignIntf::SubDetailHeader: