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

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

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022

8 files changed, 20 insertions, 12 deletions

diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 90def9ac2ff1..843311d43b72 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -57,12 +57,13 @@ class SvtCJKOptions_Impl : public utl::ConfigItem
     bool        bROEmphasisMarks;
     bool        bROVerticalCallOut;
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtCJKOptions_Impl();
     virtual ~SvtCJKOptions_Impl();
 
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
     void            Load();
 
     bool IsLoaded()                         { return bIsLoaded;         }
@@ -232,7 +233,7 @@ void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& )
     NotifyListeners(0);
 }
 
-void    SvtCJKOptions_Impl::Commit()
+void    SvtCJKOptions_Impl::ImplCommit()
 {
     Sequence<OUString> &rPropertyNames = PropertyNames::get();
     OUString* pOrgNames = rPropertyNames.getArray();
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index d4a38cced2d9..3cca42821a50 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -54,12 +54,13 @@ private:
     bool                        m_bROCTLCursorMovement;
     bool                        m_bROCTLTextNumerals;
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtCTLOptions_Impl();
     virtual ~SvtCTLOptions_Impl();
 
     virtual void    Notify( const Sequence< OUString >& _aPropertyNames ) SAL_OVERRIDE;
-    virtual void    Commit() SAL_OVERRIDE;
     void            Load();
 
     bool            IsLoaded() { return m_bIsLoaded; }
@@ -137,7 +138,7 @@ void SvtCTLOptions_Impl::Notify( const Sequence< OUString >& )
     NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
 
-void SvtCTLOptions_Impl::Commit()
+void SvtCTLOptions_Impl::ImplCommit()
 {
     Sequence< OUString > &rPropertyNames = PropertyNames::get();
     OUString* pOrgNames = rPropertyNames.getArray();
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 06d438271e05..390875ffd798 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -175,7 +175,7 @@ SvtSystemLanguageOptions::~SvtSystemLanguageOptions()
 {
 }
 
-void    SvtSystemLanguageOptions::Commit()
+void    SvtSystemLanguageOptions::ImplCommit()
 {
     //does nothing
 }
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index 3ddb900eed77..86b26d76c5f4 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -190,10 +190,16 @@ typedef ::std::map< OUString, ::std::list< NamePassRecord > > PassMap;
 
 class PasswordContainer;
 
-class StorageItem : public ::utl::ConfigItem {
+class StorageItem
+    : public ::utl::ConfigItem
+{
+private:
     PasswordContainer*     mainCont;
     bool                   hasEncoded;
     OUString        mEncoded;
+
+    virtual void            ImplCommit() SAL_OVERRIDE;
+
 public:
     StorageItem( PasswordContainer* point, const OUString& path ) :
         ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ),
@@ -217,7 +223,6 @@ public:
     bool useStorage();
 
     virtual void            Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
-    virtual void            Commit() SAL_OVERRIDE;
 };
 
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 87a55d7575fb..5c0808f1b0bf 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -282,7 +282,7 @@ void SvxSearchItem::Notify( const Sequence< OUString > & )
     SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() );
 }
 
-void SvxSearchItem::Commit()
+void SvxSearchItem::ImplCommit()
 {
 }
 
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 889ed3074ff3..8d2243fcb71f 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -383,7 +383,7 @@ void StorageItem::Notify( const Sequence< OUString >& )
 }
 
 
-void StorageItem::Commit()
+void StorageItem::ImplCommit()
 {
     // Do nothing, we stored everything we want already
 }
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index bcfacb07c6a6..e0cb7d5fd87f 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -48,7 +48,7 @@ void SysCredentialsConfigItem::Notify(
     m_pOwner->persistentConfigChanged();
 }
 
-void SysCredentialsConfigItem::Commit()
+void SysCredentialsConfigItem::ImplCommit()
 {
     // does nothing
 }
diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index faaf1d09cb0a..45574dae96af 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -38,7 +38,6 @@ class SysCredentialsConfigItem : public utl::ConfigItem
         virtual void Notify(
             const com::sun::star::uno::Sequence< OUString > &
                 seqPropertyNames ) SAL_OVERRIDE;
-        virtual void Commit() SAL_OVERRIDE;
 
         com::sun::star::uno::Sequence< OUString >
         getSystemCredentialsURLs();
@@ -49,7 +48,9 @@ class SysCredentialsConfigItem : public utl::ConfigItem
 
         //bool isSystemCredentialsURL( const OUString & rURL ) const;
 
-private:
+    private:
+        virtual void ImplCommit() SAL_OVERRIDE;
+
         ::osl::Mutex m_aMutex;
         bool m_bInited;
         com::sun::star::uno::Sequence< OUString > m_seqURLs;