From 765f6211b1371c1e40de386e715de6b3d1a8df86 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 11 Mar 2015 16:14:47 +0100
Subject: utl::ConfigItem::Commit() should call ClearModified()

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

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022
---
 include/svtools/apearcfg.hxx        | 2 +-
 include/svtools/fontsubstconfig.hxx | 5 ++++-
 include/svtools/htmlcfg.hxx         | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'include/svtools')

diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 973577d31a3c..cb308b821ae6 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -55,12 +55,12 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
     static bool  bInitialized ;
 
     SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    virtual void    ImplCommit() SAL_OVERRIDE;
 
 public:
     SvtTabAppearanceCfg( );
     virtual ~SvtTabAppearanceCfg( );
 
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 
     sal_uInt16  GetDragMode  () const { return nDragMode; }
diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx
index 4bac9db32dd7..278eb66bb936 100644
--- a/include/svtools/fontsubstconfig.hxx
+++ b/include/svtools/fontsubstconfig.hxx
@@ -35,13 +35,16 @@ struct SubstitutionStruct
 
 class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem
 {
+private:
     bool                        bIsEnabled;
     SvtFontSubstConfig_Impl*    pImpl;
+
+    virtual void                ImplCommit() SAL_OVERRIDE;
+
 public:
     SvtFontSubstConfig();
     virtual ~SvtFontSubstConfig();
 
-    virtual void                Commit() SAL_OVERRIDE;
     virtual void                Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 
     bool                        IsEnabled() const {return bIsEnabled;}
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 69d4782b0d0e..b26391755b78 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -42,11 +42,12 @@ class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
     void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames );
     void CallListeners();
 
+    virtual void    ImplCommit() SAL_OVERRIDE;
+
 public:
     SvxHtmlOptions();
     virtual ~SvxHtmlOptions();
 
-    virtual void    Commit() SAL_OVERRIDE;
     virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 
     sal_uInt16      GetFontSize(sal_uInt16 nPos) const;
-- 
cgit