diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-03-11 16:14:47 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-03-11 16:50:00 +0100 |
commit | 765f6211b1371c1e40de386e715de6b3d1a8df86 (patch) | |
tree | 0d0a8d92097a628ac72316593db9561c23948685 /sw/inc/modcfg.hxx | |
parent | 0bd20a26686d01efea4c64c1f4aac53ae1c142aa (diff) |
utl::ConfigItem::Commit() should call ClearModified()
Rename the virtual function, and add a new non-virtual Commit() to do
that.
Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022
Diffstat (limited to 'sw/inc/modcfg.hxx')
-rw-r--r-- | sw/inc/modcfg.hxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index a506db9304bf..7b1288aac1d3 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -58,11 +58,13 @@ class SwRevisionConfig : public utl::ConfigItem Color aMarkColor; //Revision/LinesChanged/Color const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwRevisionConfig(); virtual ~SwRevisionConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -80,11 +82,13 @@ class SwCompareConfig : public utl::ConfigItem sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwCompareConfig(); virtual ~SwCompareConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { }; void Load(); void SetModified() {ConfigItem::SetModified(); } @@ -106,11 +110,13 @@ class SwInsertConfig : public utl::ConfigItem bool bIsWeb; const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwInsertConfig(bool bWeb); virtual ~SwInsertConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -131,11 +137,13 @@ class SwTableConfig : public utl::ConfigItem bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwTableConfig(bool bWeb); virtual ~SwTableConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -159,11 +167,13 @@ class SwMiscConfig : public utl::ConfigItem OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwMiscConfig(); virtual ~SwMiscConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} |