From 483a4b546c850e82a2d1d304238d4830ac6b441f Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Fri, 27 Jun 2014 11:31:06 -0400
Subject: Flush modified data to the model when pressing OK in the data table
 dialog.

This dialog used to have no OK / Cancel buttons, and the data would get
flushed when the dialog got dismissed.  This behavior got lost during the
dialog conversion.

Also, SaveModified() does check whether or not the data table is modified.
No need to call IsModified() before calling SaveModified().

Change-Id: I5cea88cb52127cc5c7c1be67a5a592d87df92d0c
---
 chart2/source/controller/dialogs/DataBrowser.cxx           | 3 +--
 chart2/source/controller/main/ChartController_EditData.cxx | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index cb3ee0527127..8c0c83f4713a 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1182,8 +1182,7 @@ bool DataBrowser::SaveModified()
 
 bool DataBrowser::EndEditing()
 {
-    if( IsModified())
-        SaveModified();
+    SaveModified();
 
     // apply changes made to series headers
     ::std::for_each( m_aSeriesHeaders.begin(), m_aSeriesHeaders.end(), impl::applyChangesFunctor());
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index c87f1678318a..726ba03266fc 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -57,8 +57,8 @@ void ChartController::executeDispatch_EditData()
                 SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
                 m_xUndoManager );
             DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC );
-            // the dialog has no OK/Cancel
-            aDataEditorDialog.Execute();
+            if (aDataEditorDialog.Execute() == RET_OK)
+                aDataEditorDialog.ApplyChangesToModel();
             aUndoGuard.commit();
         }
     }
-- 
cgit