utl::ConfigItem::Commit() should call ClearModified()

Rename the virtual function, and add a new non-virtual Commit() to do
that.

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022

14 files changed, 26 insertions, 15 deletions

diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx
index ab8b6978d210..74e86c93047b 100644
--- a/sc/inc/addincfg.hxx
+++ b/sc/inc/addincfg.hxx
@@ -24,13 +24,15 @@
 
 class ScAddInCfg : public utl::ConfigItem
 {
+private:
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
             ScAddInCfg();
 
     virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
 
     com::sun::star::uno::Sequence< com::sun::star::uno::Any>
             GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames)
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index 8e69e76775f6..700e14408787 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -64,13 +64,15 @@ private:
 
 class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem
 {
+private:
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    virtual void ImplCommit() SAL_OVERRIDE;
+
 public:
     ScDefaultsCfg();
 
     void SetOptions( const ScDefaultsOptions& rNew );
 
-    virtual void Commit() SAL_OVERRIDE;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
 };
 
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index ed6ee85095ce..d080a6683ae2 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -27,17 +27,19 @@
 
 class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem
 {
+private:
     bool        bWK3Flag;
     double      fExcelColScale;
     double      fExcelRowScale;
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
             ScFilterOptions();
 
     virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
 
     bool        GetWK3Flag() const          { return bWK3Flag; }
     double      GetExcelColScale() const    { return fExcelColScale; }
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index e19de2d89e97..59ce099aab05 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -104,12 +104,14 @@ class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
     ScFormulaCfg::PropsToIds GetPropNamesToId();
     void UpdateFromProperties( const com::sun::star::uno::Sequence<OUString>& rNames );
+
+    virtual void ImplCommit() SAL_OVERRIDE;
+
 public:
     ScFormulaCfg();
 
     void SetOptions( const ScFormulaOptions& rNew );
 
-    virtual void Commit() SAL_OVERRIDE;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
 };
 
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index b6d2a0940913..cd82ef0d5336 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -81,6 +81,8 @@ class ScInputCfg : public ScInputOptions,
 {
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
             ScInputCfg();
 
@@ -88,7 +90,6 @@ public:
     void            OptionsChanged();   // after direct access to SetOptions base class
 
     virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index 88bbc3f5b739..aa9f11c1ed7b 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -45,7 +45,7 @@ public:
     void    SetCommitLink( const Link& rLink );
 
     virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
+    virtual void    ImplCommit() SAL_OVERRIDE;
 
     void    SetModified()   { ConfigItem::SetModified(); }
     com::sun::star::uno::Sequence< com::sun::star::uno::Any>
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index ff4f6edba3c9..ab3fe003a812 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -74,14 +74,16 @@ private:
 
 class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem
 {
+private:
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
             ScPrintCfg();
 
     void            SetOptions( const ScPrintOptions& rNew );
 
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
 };
 
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index db6cc3474687..4b03a47413d4 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -37,9 +37,9 @@ ScAddInCfg::ScAddInCfg() :
     EnableNotification( aNames );
 }
 
-void ScAddInCfg::Commit()
+void ScAddInCfg::ImplCommit()
 {
-    OSL_FAIL("ScAddInCfg shouldn't be modified");
+    SAL_WARN("sc", "ScAddInCfg shouldn't be modified");
 }
 
 void ScAddInCfg::Notify( const uno::Sequence<OUString>& )
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index c21eef3edf60..cf5965134b2c 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -143,7 +143,7 @@ ScDefaultsCfg::ScDefaultsCfg() :
     }
 }
 
-void ScDefaultsCfg::Commit()
+void ScDefaultsCfg::ImplCommit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues(aNames.getLength());
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index a4db66e4112d..86626d8c162c 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -84,7 +84,7 @@ ScFilterOptions::ScFilterOptions() :
     }
 }
 
-void ScFilterOptions::Commit()
+void ScFilterOptions::ImplCommit()
 {
     // options are never modified from office
 
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 1480ada92182..1e0a5f5d6c59 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -502,7 +502,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
     }
 }
 
-void ScFormulaCfg::Commit()
+void ScFormulaCfg::ImplCommit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues(aNames.getLength());
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 27c9fb8abf77..437c047d2ee7 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -185,7 +185,7 @@ ScInputCfg::ScInputCfg() :
     }
 }
 
-void ScInputCfg::Commit()
+void ScInputCfg::ImplCommit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues(aNames.getLength());
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 671e6d933756..0574517749b0 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -52,7 +52,7 @@ void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /*
     //TODO: not implemented yet...
 }
 
-void ScLinkConfigItem::Commit()
+void ScLinkConfigItem::ImplCommit()
 {
     aCommitLink.Call( this );
 }
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 6d02ed918d2b..209b8968614e 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -156,7 +156,7 @@ ScPrintCfg::ScPrintCfg() :
     }
 }
 
-void ScPrintCfg::Commit()
+void ScPrintCfg::ImplCommit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues(aNames.getLength());