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

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

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022

19 files changed, 84 insertions, 113 deletions

diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 59b7f1966f4b..b6d96899fce6 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -105,16 +105,6 @@ class SvtCommandOptions_Impl : public ConfigItem
         virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE;
 
         /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
-        /*-****************************************************************************************************
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
@@ -126,6 +116,8 @@ class SvtCommandOptions_Impl : public ConfigItem
 
     private:
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
             @descr      These methods return the current list of key names! We need it to get needed values from our
@@ -233,9 +225,9 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
 
 //  public method
 
-void SvtCommandOptions_Impl::Commit()
+void SvtCommandOptions_Impl::ImplCommit()
 {
-    OSL_FAIL( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" );
+    SAL_WARN("unotools.config","SvtCommandOptions_Impl::ImplCommit(): Not implemented yet!");
 }
 
 //  public method
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 005b1ee1a686..f91981d1a262 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -234,16 +234,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE;
 
-        /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
         //  public interface
 
         /*-****************************************************************************************************
@@ -284,6 +274,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
 
     private:
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent one module tree
             @descr      These methods return the current list of key names! We need it to get needed values from our
@@ -415,7 +407,7 @@ void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& )
 
 //  public method
 
-void SvtCompatibilityOptions_Impl::Commit()
+void SvtCompatibilityOptions_Impl::ImplCommit()
 {
     // Write all properties!
     // Delete complete set first.
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 57ead3bf9cb5..46489d7214d9 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -1118,4 +1118,10 @@ Reference< XHierarchicalNameAccess> ConfigItem::GetTree()
     return xRet;
 }
 
+void ConfigItem::Commit()
+{
+    ImplCommit();
+    ClearModified();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index de38a3b2a00a..fffd62918b72 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -90,8 +90,10 @@ public:
                     SvtDefaultOptions_Impl();
 
     OUString         GetDefaultPath( sal_uInt16 nId ) const;
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
+
+private:
+    virtual void    ImplCommit() SAL_OVERRIDE;
 };
 
 // global ----------------------------------------------------------------
@@ -175,7 +177,7 @@ void SvtDefaultOptions_Impl::Notify( const Sequence< OUString >&  )
     // no notification, will never be changed
 }
 
-void SvtDefaultOptions_Impl::Commit()
+void SvtDefaultOptions_Impl::ImplCommit()
 {
     // will never be changed
 }
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 161875b98bfe..f406c8d225f2 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -170,16 +170,6 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
         virtual void Notify( const Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE;
 
         /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
-        /*-****************************************************************************************************
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
@@ -189,6 +179,8 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
 
     private:
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
             @descr      These methods return the current list of key names! We need it to get needed values from our
@@ -377,9 +369,9 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
 
 //  public method
 
-void SvtDynamicMenuOptions_Impl::Commit()
+void SvtDynamicMenuOptions_Impl::ImplCommit()
 {
-    OSL_FAIL( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" );
+    SAL_WARN("unotools.config", "SvtDynamicMenuOptions_Impl::ImplCommit(): Not implemented yet!");
     /*
     // Write all properties!
     // Delete complete sets first.
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index eaae708a8619..bd3f79ca46e7 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -159,10 +159,10 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
 
 //  public method
 
-void GlobalEventConfig_Impl::Commit()
+void GlobalEventConfig_Impl::ImplCommit()
 {
     //DF need to check it this is correct??
-    OSL_TRACE("In GlobalEventConfig_Impl::Commit");
+    OSL_TRACE("In GlobalEventConfig_Impl::ImplCommit");
     EventBindingHash::const_iterator it = m_eventBindingHash.begin();
     EventBindingHash::const_iterator it_end = m_eventBindingHash.end();
     // clear the existing nodes
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index e079c937a7df..d7db4b8db683 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -69,18 +69,10 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE;
 
-        /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
         SvtExtendedSecurityOptions::OpenHyperlinkMode   GetOpenHyperlinkMode() { return m_eOpenHyperlinkMode;}
+
     private:
+        virtual void ImplCommit() SAL_OVERRIDE;
 
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
@@ -176,7 +168,7 @@ void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& )
 
 //  public method
 
-void SvtExtendedSecurityOptions_Impl::Commit()
+void SvtExtendedSecurityOptions_Impl::ImplCommit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
     Sequence< OUString >    seqNames    = GetPropertyNames  ();
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 96b75f45c5a5..d929b312cc7e 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -54,15 +54,19 @@ using namespace com::sun::star::uno;
 
 class SvtAppFilterOptions_Impl : public utl::ConfigItem
 {
+private:
     bool                bLoadVBA;
     bool                bSaveVBA;
+
+protected:
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtAppFilterOptions_Impl(const OUString& rRoot) :
         utl::ConfigItem(rRoot),
         bLoadVBA(false),
         bSaveVBA(false)  {}
     virtual ~SvtAppFilterOptions_Impl();
-    virtual void            Commit() SAL_OVERRIDE;
     virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
     void                    Load();
 
@@ -88,7 +92,7 @@ SvtAppFilterOptions_Impl::~SvtAppFilterOptions_Impl()
         Commit();
 }
 
-void    SvtAppFilterOptions_Impl::Commit()
+void    SvtAppFilterOptions_Impl::ImplCommit()
 {
     Sequence<OUString> aNames(2);
     OUString* pNames = aNames.getArray();
@@ -127,13 +131,16 @@ void    SvtAppFilterOptions_Impl::Load()
 
 class SvtWriterFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
+private:
     bool                bLoadExecutable;
+
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtWriterFilterOptions_Impl(const OUString& rRoot) :
         SvtAppFilterOptions_Impl(rRoot),
         bLoadExecutable(false)
     {}
-    virtual void            Commit() SAL_OVERRIDE;
     void                    Load();
 
     bool                IsLoadExecutable() const {return bLoadExecutable;}
@@ -145,9 +152,9 @@ public:
                             }
 };
 
-void SvtWriterFilterOptions_Impl::Commit()
+void SvtWriterFilterOptions_Impl::ImplCommit()
 {
-    SvtAppFilterOptions_Impl::Commit();
+    SvtAppFilterOptions_Impl::ImplCommit();
 
     Sequence<OUString> aNames(1);
     aNames[0] = "Executable";
@@ -172,13 +179,16 @@ void SvtWriterFilterOptions_Impl::Load()
 
 class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
+private:
     bool                bLoadExecutable;
+
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtCalcFilterOptions_Impl(const OUString& rRoot) :
         SvtAppFilterOptions_Impl(rRoot),
         bLoadExecutable(false)
     {}
-    virtual void            Commit() SAL_OVERRIDE;
     void                    Load();
 
     bool                IsLoadExecutable() const {return bLoadExecutable;}
@@ -190,9 +200,9 @@ public:
                             }
 };
 
-void SvtCalcFilterOptions_Impl::Commit()
+void SvtCalcFilterOptions_Impl::ImplCommit()
 {
-    SvtAppFilterOptions_Impl::Commit();
+    SvtAppFilterOptions_Impl::ImplCommit();
 
     Sequence<OUString> aNames(1);
     aNames[0] = "Executable";
@@ -367,7 +377,7 @@ void SvtFilterOptions::Notify( const Sequence<OUString>& )
     Load();
 }
 
-void SvtFilterOptions::Commit()
+void SvtFilterOptions::ImplCommit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
     Sequence<Any> aValues(aNames.getLength());
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index b7c26f7d04e8..5766b9a9603c 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -64,16 +64,6 @@ class SvtFontOptions_Impl : public ConfigItem
         virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE;
 
         /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
-        /*-****************************************************************************************************
             @short      access method to get internal values
             @descr      These method give us a chance to regulate access to our internal values.
                         It's not used in the moment - but it's possible for the feature!
@@ -87,6 +77,8 @@ class SvtFontOptions_Impl : public ConfigItem
 
     private:
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
             @descr      These methods return a static const list of key names. We need it to get needed values from our
@@ -203,7 +195,7 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 
 //  public method
 
-void SvtFontOptions_Impl::Commit()
+void SvtFontOptions_Impl::ImplCommit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
     Sequence< OUString >    seqNames    = impl_GetPropertyNames();
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 881c81889ed0..e86c8dd002ac 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -152,6 +152,7 @@ class SvtLinguConfigItem : public utl::ConfigItem
 
     SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
     SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+    virtual void    ImplCommit() SAL_OVERRIDE;
 
 public:
     SvtLinguConfigItem();
@@ -159,7 +160,6 @@ public:
 
     // utl::ConfigItem
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
 
     // make some protected functions of utl::ConfigItem public
     using utl::ConfigItem::GetNodeNames;
@@ -207,7 +207,7 @@ void SvtLinguConfigItem::Notify( const uno::Sequence< OUString > &rPropertyNames
     NotifyListeners(0);
 }
 
-void SvtLinguConfigItem::Commit()
+void SvtLinguConfigItem::ImplCommit()
 {
     SaveOptions( GetPropertyNames() );
 }
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 7fd2440196be..f2f2ab1a315c 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -63,16 +63,6 @@ class SvtLocalisationOptions_Impl : public ConfigItem
         virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE;
 
         /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
-        /*-****************************************************************************************************
             @short      access method to get internal values
             @descr      These method give us a chance to regulate access to our internal values.
                         It's not used in the moment - but it's possible for the feature!
@@ -83,6 +73,8 @@ class SvtLocalisationOptions_Impl : public ConfigItem
 
     private:
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
             @descr      These methods return a static const list of key names. We need it to get needed values from our
@@ -188,7 +180,7 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert
 
 //  public method
 
-void SvtLocalisationOptions_Impl::Commit()
+void SvtLocalisationOptions_Impl::ImplCommit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
     Sequence< OUString >    seqNames    = GetPropertyNames  ();
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 74666473b99b..2624f41b6b5c 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -38,6 +38,7 @@ static sal_Int32 nRefCount = 0;
 
 class SfxMiscCfg : public utl::ConfigItem
 {
+private:
     bool            bPaperSize;     // printer warnings
     bool            bPaperOrientation;
     bool            bNotFound;
@@ -46,12 +47,13 @@ class SfxMiscCfg : public utl::ConfigItem
     const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
     void                    Load();
 
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
     SfxMiscCfg( );
     virtual ~SfxMiscCfg( );
 
     virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
-    virtual void            Commit() SAL_OVERRIDE;
 
     bool        IsNotFoundWarning()     const {return bNotFound;}
     void        SetNotFoundWarning( bool bSet);
@@ -153,7 +155,7 @@ void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<OUString>& )
     Load();
 }
 
-void SfxMiscCfg::Commit()
+void SfxMiscCfg::ImplCommit()
 {
     const Sequence<OUString>& rNames = GetPropertyNames();
     Sequence<Any> aValues(rNames.getLength());
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 7f351df8843b..7f1b55fe4863 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -290,7 +290,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
         //  override methods of baseclass
 
         virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE;
-        virtual void Commit(                                                             ) SAL_OVERRIDE;
 
         //  public interface
 
@@ -316,6 +315,8 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
         static css::uno::Sequence< OUString > impl_ExpandSetNames ( const css::uno::Sequence< OUString >& lSetNames   );
                void                                  impl_Read           ( const css::uno::Sequence< OUString >& lSetNames   );
 
+        virtual void ImplCommit() SAL_OVERRIDE;
+
     //  private types
 
     private:
@@ -405,7 +406,7 @@ void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& )
     @seealso    baseclass ConfigItem
     @threadsafe no
 *//*-*****************************************************************************************************/
-void SvtModuleOptions_Impl::Commit()
+void SvtModuleOptions_Impl::ImplCommit()
 {
     // Reserve memory for ALL possible factory properties!
     // Step over all factories and get her really changed values only.
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 92a1ba278371..2683a8870acb 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -52,11 +52,12 @@ private:
     void            ReadNode( const OUString& _rNode, NodeType _eType );
     bool        IsHidden( const OUString& _rPath ) const;
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
                     SvtOptionsDlgOptions_Impl();
 
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
 
     static ::osl::Mutex & getInitMutex();
 
@@ -96,7 +97,7 @@ SvtOptionsDlgOptions_Impl::SvtOptionsDlgOptions_Impl()
     }
 }
 
-void SvtOptionsDlgOptions_Impl::Commit()
+void SvtOptionsDlgOptions_Impl::ImplCommit()
 {
     // nothing to commit
 }
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index b1e519dc922d..33d61f2c4252 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -59,7 +59,6 @@ public:
 
 //  override methods of baseclass
 
-    virtual void Commit() SAL_OVERRIDE;
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
 
 //  public interface
@@ -78,6 +77,8 @@ public:
 
 private:
 
+    virtual void ImplCommit() SAL_OVERRIDE;
+
     static Sequence< OUString > impl_GetPropertyNames();
 
 //  private member
@@ -164,7 +165,7 @@ SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl()
 
 //  Commit
 
-void SvtPrintWarningOptions_Impl::Commit()
+void SvtPrintWarningOptions_Impl::ImplCommit()
 {
     Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
     Sequence< Any >         aSeqValues( aSeqNames.getLength() );
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 9031dee52c7e..57b0aec7f8ae 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -90,12 +90,13 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bROUseSHA1InODF12,
                                         bROUseBlowfishInODF12;
 
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
                             SvtSaveOptions_Impl();
                             virtual ~SvtSaveOptions_Impl();
 
     virtual void            Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
-    virtual void            Commit() SAL_OVERRIDE;
 
     sal_Int32               GetAutoSaveTime() const             { return nAutoSaveTime; }
     bool                    IsUseUserData() const               { return bUseUserData; }
@@ -571,7 +572,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
 SvtSaveOptions_Impl::~SvtSaveOptions_Impl()
 {}
 
-void SvtSaveOptions_Impl::Commit()
+void SvtSaveOptions_Impl::ImplCommit()
 {
     Sequence< OUString > aOrgNames = GetPropertyNames();
     OUString* pOrgNames = aOrgNames.getArray();
@@ -750,15 +751,16 @@ void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& )
 
 class SvtLoadOptions_Impl : public utl::ConfigItem
 {
-
+private:
     bool                            bLoadUserDefinedSettings;
 
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
                             SvtLoadOptions_Impl();
                             virtual ~SvtLoadOptions_Impl();
 
     virtual void            Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
-    virtual void            Commit() SAL_OVERRIDE;
 
     void                    SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();}
     bool                IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
@@ -784,7 +786,7 @@ SvtLoadOptions_Impl::~SvtLoadOptions_Impl()
 {
 }
 
-void SvtLoadOptions_Impl::Commit()
+void SvtLoadOptions_Impl::ImplCommit()
 {
     Sequence< OUString > aNames(1);
     aNames[0] = cUserDefinedSettings;
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index bca047c4e270..59eae30135bf 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -43,6 +43,9 @@ class SvtSearchOptions_Impl : public ConfigItem
     SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
     SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
 
+    // ConfigItem
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 protected:
     bool            IsModified() const { return bModified; }
     using ConfigItem::SetModified;
@@ -56,8 +59,6 @@ public:
     SvtSearchOptions_Impl();
     virtual ~SvtSearchOptions_Impl();
 
-    // ConfigItem
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
 
     bool            GetFlag( sal_uInt16 nOffset ) const;
@@ -77,7 +78,7 @@ SvtSearchOptions_Impl::~SvtSearchOptions_Impl()
     Commit();
 }
 
-void SvtSearchOptions_Impl::Commit()
+void SvtSearchOptions_Impl::ImplCommit()
 {
     if (IsModified())
         Save();
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 32631e07a142..c235a73bc168 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -100,6 +100,9 @@ using namespace ::com::sun::star::uno;
 class SvtSecurityOptions_Impl : public ConfigItem
 {
 
+    private:
+        virtual void ImplCommit() SAL_OVERRIDE;
+
     //  public methods
 
     public:
@@ -124,16 +127,6 @@ class SvtSecurityOptions_Impl : public ConfigItem
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames ) SAL_OVERRIDE;
 
-        /*-****************************************************************************************************
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso    baseclass ConfigItem
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit() SAL_OVERRIDE;
-
         //  public interface
 
         bool                IsReadOnly      ( SvtSecurityOptions::EOption eOption                   ) const;
@@ -572,7 +565,7 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
     LoadAuthors();
 }
 
-void SvtSecurityOptions_Impl::Commit()
+void SvtSecurityOptions_Impl::ImplCommit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
     Sequence< OUString >    lOrgNames = GetPropertyNames();
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index ff5da146f076..5a8d10788056 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -67,12 +67,13 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
         void                    MakeRealLocale();
         void                    MakeRealUILocale();
 
+    virtual void                ImplCommit() SAL_OVERRIDE;
+
 public:
                                 SvtSysLocaleOptions_Impl();
     virtual                     ~SvtSysLocaleOptions_Impl();
 
     virtual void                Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
-    virtual void                Commit() SAL_OVERRIDE;
 
             const OUString&     GetLocaleString() const
                                     { return m_aLocaleString; }
@@ -307,7 +308,7 @@ bool SvtSysLocaleOptions_Impl::IsReadOnly( SvtSysLocaleOptions::EOption eOption
     return bReadOnly;
 }
 
-void SvtSysLocaleOptions_Impl::Commit()
+void SvtSysLocaleOptions_Impl::ImplCommit()
 {
     const Sequence< OUString > aOrgNames = GetPropertyNames();
     sal_Int32 nOrgCount = aOrgNames.getLength();
@@ -384,7 +385,6 @@ void SvtSysLocaleOptions_Impl::Commit()
     aNames.realloc(nRealCount);
     aValues.realloc(nRealCount);
     PutProperties( aNames, aValues );
-    ClearModified();
 }
 
 void SvtSysLocaleOptions_Impl::SetLocaleString( const OUString& rStr )