mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Fix: 64 bit building & band slice

Browse Source
This commit is contained in:
Arin Alexander 2016-03-25 19:59:38 +03:00
parent 2679e0ec07
commit 225e0f6c91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
limereport/lrreportrender.cpp
View File

@ -552,7 +552,7 @@ void ReportRender::popPageFooterGroupValues(BandDesignIntf *dataBand)
// FIXME Probably coincidence Field and Variables // FIXME Probably coincidence Field and Variables
if ((!m_popupedExpression.contains(dataBand))||(!m_popupedExpression.values(dataBand).contains(gf->data()))){ if ((!m_popupedExpression.contains(dataBand))||(!m_popupedExpression.values(dataBand).contains(gf->data()))){
m_popupedExpression.insert(dataBand,gf->data()); m_popupedExpression.insert(dataBand,gf->data());
m_popupedValues.insert(QString::number((long)dataBand,16)+'|'+gf->data(), gf->values()[gf->values().count()-1]); m_popupedValues.insert(QString("%1").arg((quintptr)dataBand)+'|'+gf->data(), gf->values()[gf->values().count()-1]);
gf->values().pop_back(); gf->values().pop_back();
} }
} }
@ -568,7 +568,7 @@ void ReportRender::pushPageFooterGroupValues(BandDesignIntf *dataBand)
if ((gf->dataBandName()==dataBand->objectName())){ if ((gf->dataBandName()==dataBand->objectName())){
// FIXME Probably coincidence Field and Variables // FIXME Probably coincidence Field and Variables
if ((m_popupedExpression.contains(dataBand))&&(m_popupedExpression.values(dataBand).contains(gf->data()))){ if ((m_popupedExpression.contains(dataBand))&&(m_popupedExpression.values(dataBand).contains(gf->data()))){
gf->values().push_back(m_popupedValues.value(QString::number((long)dataBand,16)+'|'+gf->data())); gf->values().push_back(m_popupedValues.value(QString("%1").arg((quintptr)dataBand)+'|'+gf->data()));
} }
} }
} }
@ -743,7 +743,7 @@ BandDesignIntf* ReportRender::sliceBand(BandDesignIntf *band, BandDesignIntf* pa
} }
} }
if (registerBand(band)) break; if (registerBand(band)) break;
} } else break;
} }
if (band->isEmpty()) { if (band->isEmpty()) {
@ -923,7 +923,8 @@ void ReportRender::checkLostHeadersOnPrevPage()
it.toBack(); it.toBack();
if (it.hasPrevious()) if (it.hasPrevious())
if (it.previous()->isFooter()) if (it.previous()->isFooter())
it.previous(); if (it.hasPrevious()) it.previous();
else return;
while (it.hasPrevious()){ while (it.hasPrevious()){
if (it.value()->isHeader()){ if (it.value()->isHeader()){