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

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

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022

4 files changed, 11 insertions, 6 deletions

diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 8c10a9e0e4be..8e18319a5c36 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -245,7 +245,7 @@ bool SvxChartOptions::RetrieveOptions()
     return false;
 }
 
-void SvxChartOptions::Commit()
+void SvxChartOptions::ImplCommit()
 {
     uno::Sequence< OUString > aNames = GetPropertyNames();
     uno::Sequence< uno::Any > aValues( aNames.getLength());
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index fdfc06f675ba..f7e34fb8fde4 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -72,6 +72,8 @@ private:
         { return maPropertyNames; }
     bool RetrieveOptions();
 
+    virtual void                ImplCommit() SAL_OVERRIDE;
+
 public:
     SvxChartOptions();
     virtual ~SvxChartOptions();
@@ -79,7 +81,6 @@ public:
     const SvxChartColorTable&   GetDefaultColors();
     void                        SetDefaultColors( const SvxChartColorTable& aCol );
 
-    virtual void                Commit() SAL_OVERRIDE;
     virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 };
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 50e853008ad7..c384de188dec 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -940,11 +940,13 @@ class MailerProgramCfg_Impl : public utl::ConfigItem
     bool bROProgram;
 
     const Sequence<OUString> GetPropertyNames();
+
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
     MailerProgramCfg_Impl();
     virtual ~MailerProgramCfg_Impl();
 
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 };
 
@@ -994,7 +996,7 @@ const Sequence<OUString> MailerProgramCfg_Impl::GetPropertyNames()
 
 /* -------------------------------------------------------------------------*/
 
-void MailerProgramCfg_Impl::Commit()
+void MailerProgramCfg_Impl::ImplCommit()
 {
     const Sequence< OUString > aOrgNames = GetPropertyNames();
     sal_Int32 nOrgCount = aOrgNames.getLength();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fdcbb0a16191..88c2cdb9a006 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -249,15 +249,17 @@ static sal_uInt16 getGroupNodeId( const OUString& rModule )
 
 class MailMergeCfg_Impl : public utl::ConfigItem
 {
+private:
     friend class SvxEMailTabPage;
     // variables
     bool bIsEmailSupported;
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
     MailMergeCfg_Impl();
     virtual ~MailMergeCfg_Impl();
 
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 
     bool IsEmailSupported() const {return bIsEmailSupported;}
@@ -280,7 +282,7 @@ MailMergeCfg_Impl::~MailMergeCfg_Impl()
 {
 }
 /* -------------------------------------------------------------------------*/
-void MailMergeCfg_Impl::Commit()
+void MailMergeCfg_Impl::ImplCommit()
 {
 }