0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 00:18:06 +03:00

Finish 1.4.122

# Conflicts:
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrreportdesignwindow.cpp
#	limereport/lrreportengine.cpp
This commit is contained in:
Arin Alexander
2019-01-31 21:07:39 +03:00
7 changed files with 39 additions and 17 deletions

View File

@@ -711,6 +711,7 @@ bool ReportEnginePrivate::slotLoadFromFile(const QString &fileName)
EASY_BLOCK("Connect auto connections")
dataManager()->connectAutoConnections();
EASY_END_BLOCK;
dataManager()->dropChanges();
if ( hasActivePreview() )
{
@@ -874,6 +875,7 @@ bool ReportEnginePrivate::saveToFile(const QString &fileName)
page->setToSaved();
}
}
m_datasources->dropChanges();
return saved;
}
@@ -888,6 +890,7 @@ QByteArray ReportEnginePrivate::saveToByteArray()
page->setToSaved();
}
}
m_datasources->dropChanges();
return result;
}
@@ -901,6 +904,7 @@ QString ReportEnginePrivate::saveToString(){
page->setToSaved();
}
}
m_datasources->dropChanges();
return result;
}
@@ -909,6 +913,9 @@ bool ReportEnginePrivate::isNeedToSave()
foreach(PageDesignIntf* page, m_pages){
if (page->isHasChanges()) return true;
}
if (dataManager()->isHasChanges()){
return true;
}
return false;
}