mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source 
Conflicts:
	limereport/items/lrtextitem.cpp
	limereport/lrreportdesignwidget.cpp
This commit is contained in:
Arin Alex
2016-08-02 01:43:05 +03:00
parent a2346bc6aa da3eb52563
commit 06e5b1f29a
8 changed files with 66 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrreportdesignwidget.cpp
View File

@@ -258,7 +258,9 @@ void ReportDesignWidget::slotItemSelected(BaseDesignIntf *item){
void ReportDesignWidget::saveToFile(const QString &fileName){
m_report->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
m_report->saveToFile(fileName);
if (m_report->saveToFile(fileName)) {
m_report->emitSaveFinished();
}
}
bool ReportDesignWidget::save()