mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Merge tag '1.5.33' into develop
Finish 1.5.33
This commit is contained in:
commit
966e271b9e
@ -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}\\\"
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user