Finish 1.5.33

fralx · Feb 4, 2020 · 824b660 · 824b660
2 parents cd7db10 + 2ac3f71
commit 824b660
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/common.pri b/common.pri
@@ -127,7 +127,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}\\\"

diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp
@@ -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

diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h
@@ -311,6 +311,7 @@ private slots:
     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;