From d59987b164bc32efe8f99ad49c139b4fc7ca3c2f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 12 Dec 2019 16:57:30 +0200
Subject: loplugin:expandablemethods

Change-Id: I333d91ea5ce78c82e9bb107f934614efc7bfb8f7
Reviewed-on: https://gerrit.libreoffice.org/85078
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 chart2/source/controller/dialogs/dlg_DataEditor.cxx |  7 +------
 chart2/source/controller/dialogs/dlg_DataSource.cxx | 14 ++------------
 chart2/source/controller/inc/dlg_DataEditor.hxx     |  1 -
 chart2/source/controller/inc/dlg_DataSource.hxx     |  3 ---
 4 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index a9fdf71a96e0..5e7c939a2262 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -139,16 +139,11 @@ void DataEditor::SetReadOnly( bool bReadOnly )
 
 IMPL_LINK_NOARG(DataEditor, CloseHdl, weld::Button&, void)
 {
-    bool bApplied = ApplyChangesToModel();
+    bool bApplied = m_xBrwData->EndEditing(); // apply changes to model
     if (bApplied)
         m_xDialog->response(RET_CLOSE);
 }
 
-bool DataEditor::ApplyChangesToModel()
-{
-    return m_xBrwData->EndEditing();
-}
-
 } // namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 7d5c4670b81c..46faf3b8774b 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -142,16 +142,6 @@ IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool)
     return m_bTogglingEnabled;
 }
 
-void DataSourceDialog::DisableTabToggling()
-{
-    m_bTogglingEnabled = false;
-}
-
-void DataSourceDialog::EnableTabToggling()
-{
-    m_bTogglingEnabled = true;
-}
-
 void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage)
 {
     if (pTabPage == m_xRangeChooserTabPage.get())
@@ -169,7 +159,7 @@ void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage)
             m_xTabControl->set_current_page(1);
         else if( m_bDataSourceTabIsValid )
             m_xTabControl->set_current_page(0);
-        DisableTabToggling();
+        m_bTogglingEnabled = false;
     }
 }
 
@@ -183,7 +173,7 @@ void DataSourceDialog::setValidPage(BuilderPage* pTabPage)
     if (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid)
     {
         m_xBtnOK->set_sensitive(true);
-        EnableTabToggling();
+        m_bTogglingEnabled = true;
     }
 }
 
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index f4682ab43212..2d36f38df7bf 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -47,7 +47,6 @@ public:
     DECL_LINK(CloseHdl, weld::Button&, void);
 
     void SetReadOnly( bool bReadOnly );
-    bool ApplyChangesToModel();
 
 private:
     bool                           m_bReadOnly;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 58965cb967f0..ca8777568826 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -57,9 +57,6 @@ public:
     virtual void setValidPage( BuilderPage * pTabPage ) override;
 
 private:
-    void DisableTabToggling();
-    void EnableTabToggling();
-
     DECL_LINK(ActivatePageHdl, const OString&, void);
     DECL_LINK(DeactivatePageHdl, const OString&, bool);
 
-- 
cgit v1.2.3