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

Merge tag '1.5.33' into develop

Browse Source 
Finish 1.5.33
This commit is contained in:
Arin Alexander 2020-02-04 11:41:31 +03:00
commit 966e271b9e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -128,7 +128,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 32
LIMEREPORT_VERSION_RELEASE = 33
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

15
limereport/lrreportengine.cpp
View File

@ -1254,6 +1254,11 @@ BaseDesignIntf* ReportEnginePrivate::createWatermark(PageDesignIntf* page, Water
}
void ReportEnginePrivate::clearRenderingPages(){
qDeleteAll(m_renderingPages.begin(), m_renderingPages.end());
m_renderingPages.clear();
}
ReportPages ReportEnginePrivate::renderToPages()
{
int startTOCPage = -1;
@ -1275,7 +1280,7 @@ ReportPages ReportEnginePrivate::renderToPages()
m_reportRendering = true;
m_reportRender->setDatasources(dataManager());
m_reportRender->setScriptContext(scriptContext());
m_renderingPages.clear();
clearRenderingPages();
foreach (PageDesignIntf* page, m_pages) {
QVector<BaseDesignIntf*> watermarks;
@ -1349,14 +1354,10 @@ ReportPages ReportEnginePrivate::renderToPages()
emit renderFinished();
m_reportRender.clear();
//foreach(PageItemDesignIntf* page, m_renderingPages){
// delete page;
//}
m_renderingPages.clear();
clearRenderingPages();
}
m_reportRendering = false;
//activateLanguage(QLocale::AnyLanguage);
#ifdef USE_QTSCRIPTENGINE
ScriptEngineManager::instance().scriptEngine()->popContext();
#endif

1
limereport/lrreportengine_p.h
View File

@ -311,6 +311,7 @@ private:
void initReport();
void paintByExternalPainter(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem* options);
void dropChanges(){ m_datasources->dropChanges(); m_scriptEngineContext->dropChanges();}
void clearRenderingPages();
private:
QList<PageDesignIntf*> m_pages;
QList<PageItemDesignIntf*> m_renderingPages;