[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source

[Kohei Yoshida]

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

New commits:
commit 388e66387bb6346f7cdc8b55ade39fd6a0bc2545
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Jun 27 11:31:06 2014 -0400

    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
    (cherry picked from commit 483a4b546c850e82a2d1d304238d4830ac6b441f)
    Reviewed-on: https://gerrit.libreoffice.org/9940
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 94174dd..bf4f089 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1202,8 +1202,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 c87f167..726ba03 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();
         }
     }