chart2/source/controller/main/ConfigurationAccess.cxx | 6 + chart2/source/tools/ConfigColorScheme.cxx | 4 - cui/source/options/cfgchart.cxx | 2 cui/source/options/cfgchart.hxx | 3 cui/source/options/optinet2.cxx | 6 + cui/source/options/treeopt.cxx | 6 + dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 - editeng/source/misc/acorrcfg.cxx | 6 - extensions/source/bibliography/bibconfig.cxx | 5 - extensions/source/bibliography/bibconfig.hxx | 4 - framework/inc/classes/protocolhandlercache.hxx | 3 framework/source/fwe/classes/addonsoptions.cxx | 22 +---- framework/source/fwi/classes/protocolhandlercache.cxx | 2 framework/source/services/substitutepathvars.cxx | 68 ++++++++--------- include/editeng/acorrcfg.hxx | 8 +- include/svl/languageoptions.hxx | 3 include/svl/srchitem.hxx | 3 include/svtools/apearcfg.hxx | 2 include/svtools/fontsubstconfig.hxx | 5 + include/svtools/htmlcfg.hxx | 3 include/unotools/configitem.hxx | 6 + include/unotools/eventcfg.hxx | 4 - include/unotools/fltrcfg.hxx | 5 + include/vcl/configsettings.hxx | 5 + linguistic/source/lngsvcmgr.cxx | 4 - linguistic/source/lngsvcmgr.hxx | 2 sc/inc/addincfg.hxx | 4 - sc/inc/defaultsoptions.hxx | 4 - sc/inc/filtopt.hxx | 4 - sc/inc/formulaopt.hxx | 4 - sc/inc/inputopt.hxx | 3 sc/inc/optutil.hxx | 2 sc/inc/printopt.hxx | 4 - sc/source/core/tool/addincfg.cxx | 4 - sc/source/core/tool/defaultsoptions.cxx | 2 sc/source/core/tool/filtopt.cxx | 2 sc/source/core/tool/formulaopt.cxx | 2 sc/source/core/tool/inputopt.cxx | 2 sc/source/core/tool/optutil.cxx | 2 sc/source/core/tool/printopt.cxx | 2 sd/source/ui/app/optsitem.cxx | 2 sd/source/ui/inc/optsitem.hxx | 3 starmath/source/cfgitem.cxx | 2 starmath/source/cfgitem.hxx | 3 svl/source/config/cjkoptions.cxx | 5 - svl/source/config/ctloptions.cxx | 8 +- svl/source/config/languageoptions.cxx | 2 svl/source/inc/passwordcontainer.hxx | 9 +- svl/source/items/srchitem.cxx | 2 svl/source/passwordcontainer/passwordcontainer.cxx | 2 svl/source/passwordcontainer/syscreds.cxx | 2 svl/source/passwordcontainer/syscreds.hxx | 5 - svtools/source/config/apearcfg.cxx | 2 svtools/source/config/colorcfg.cxx | 6 + svtools/source/config/extcolorcfg.cxx | 6 + svtools/source/config/fontsubstconfig.cxx | 2 svtools/source/config/helpopt.cxx | 5 - svtools/source/config/htmlcfg.cxx | 2 svtools/source/config/menuoptions.cxx | 22 +---- svtools/source/config/miscopt.cxx | 21 +---- svtools/source/config/optionsdrawinglayer.cxx | 13 +-- svtools/source/config/slidesorterbaropt.cxx | 15 +-- svtools/source/config/toolpanelopt.cxx | 16 +--- svtools/source/dialogs/addresstemplate.cxx | 4 - svx/source/form/fmshimp.cxx | 2 svx/source/inc/fmshimp.hxx | 2 sw/inc/PostItMgr.hxx | 4 - sw/inc/modcfg.hxx | 50 +++++++----- sw/inc/prtopt.hxx | 5 + sw/inc/swfltopt.hxx | 4 - sw/source/core/doc/number.cxx | 8 +- sw/source/core/ole/ndole.cxx | 5 - sw/source/filter/basflt/fltini.cxx | 2 sw/source/ui/dbui/dbinsdlg.cxx | 2 sw/source/uibase/config/barcfg.cxx | 2 sw/source/uibase/config/dbconfig.cxx | 2 sw/source/uibase/config/fontcfg.cxx | 2 sw/source/uibase/config/modcfg.cxx | 10 +- sw/source/uibase/config/prtopt.cxx | 2 sw/source/uibase/config/usrpref.cxx | 10 +- sw/source/uibase/dbui/mmconfigitem.cxx | 5 - sw/source/uibase/docvw/PostItMgr.cxx | 2 sw/source/uibase/envelp/envimg.cxx | 2 sw/source/uibase/envelp/labelcfg.cxx | 2 sw/source/uibase/envelp/labimg.cxx | 2 sw/source/uibase/inc/barcfg.hxx | 3 sw/source/uibase/inc/dbconfig.hxx | 3 sw/source/uibase/inc/dbinsdlg.hxx | 2 sw/source/uibase/inc/envimg.hxx | 5 + sw/source/uibase/inc/fontcfg.hxx | 3 sw/source/uibase/inc/labelcfg.hxx | 4 - sw/source/uibase/inc/labimg.hxx | 5 + sw/source/uibase/inc/navicfg.hxx | 3 sw/source/uibase/inc/usrpref.hxx | 54 ++++++++----- sw/source/uibase/utlui/navicfg.cxx | 2 unotools/source/config/cmdoptions.cxx | 22 +---- unotools/source/config/compatibility.cxx | 20 +---- unotools/source/config/configitem.cxx | 6 + unotools/source/config/defaultoptions.cxx | 6 + unotools/source/config/dynamicmenuoptions.cxx | 22 +---- unotools/source/config/eventcfg.cxx | 10 -- unotools/source/config/extendedsecurityoptions.cxx | 20 +---- unotools/source/config/fltrcfg.cxx | 31 +++++-- unotools/source/config/fontoptions.cxx | 20 +---- unotools/source/config/lingucfg.cxx | 4 - unotools/source/config/localisationoptions.cxx | 20 +---- unotools/source/config/misccfg.cxx | 6 + unotools/source/config/moduleoptions.cxx | 20 +---- unotools/source/config/optionsdlg.cxx | 5 - unotools/source/config/printwarningoptions.cxx | 8 +- unotools/source/config/saveopt.cxx | 12 +-- unotools/source/config/searchopt.cxx | 9 +- unotools/source/config/securityoptions.cxx | 18 +--- unotools/source/config/syslocaleoptions.cxx | 9 +- vcl/source/gdi/configsettings.cxx | 5 - vcl/unx/generic/dtrans/config.cxx | 9 -- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 7 + 117 files changed, 426 insertions(+), 463 deletions(-)
New commits: commit 465359c35fcd8c30a2bedd3d0beb07c0c1c36cba Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 11 16:39:24 2015 +0100 do not call virtual Commit() from dtors of utl::ConfigItem subclasses ~SvtAppFilterOptions_Impl() demonstrates that this is a bad idea, by not invoking its subclasses' ImplCommit() but its own. Change-Id: Ic675e9cd3be1494c740a4f289be3bdbf0d1a122b diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 4c7b65c..5a3ed54 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -192,8 +192,7 @@ BibConfig::BibConfig() BibConfig::~BibConfig() { - if(IsModified()) - Commit(); + assert(!IsModified()); // should have been committed delete pMappingsArr; } diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 5869906..dae10bd 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -378,11 +378,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() AddonsOptions_Impl::~AddonsOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } void AddonsOptions_Impl::ReadConfigurationData() diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 3cca428..b2e79ac 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -128,8 +128,7 @@ SvtCTLOptions_Impl::SvtCTLOptions_Impl() : } SvtCTLOptions_Impl::~SvtCTLOptions_Impl() { - if ( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } void SvtCTLOptions_Impl::Notify( const Sequence< OUString >& ) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 60d931a6..1a74215 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -227,12 +227,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() SvtMenuOptions_Impl::~SvtMenuOptions_Impl() { - // Flush data to configuration! - // User has no chance to do that. - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 9d4fcaf..0dd1380 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -386,11 +386,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() SvtMiscOptions_Impl::~SvtMiscOptions_Impl() { - // We must save our current values .. if user forgets it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } static int lcl_MapPropertyName( const OUString& rCompare, diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 1e398d9..d706f5e 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -543,8 +543,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() { - if( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index cf0e0c6..dd62de3 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -172,7 +172,7 @@ SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl() SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl() { - Commit(); + assert(!IsModified()); // should have been committed } static int lcl_MapPropertyName( const OUString& rCompare, diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 4934eeb..4ae9153 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -170,7 +170,7 @@ SvtToolPanelOptions_Impl::SvtToolPanelOptions_Impl() SvtToolPanelOptions_Impl::~SvtToolPanelOptions_Impl() { - Commit(); + assert(!IsModified()); // should have been committed } static int lcl_MapPropertyName( const OUString& rCompare, diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index b6d9689..b55d8a8 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -175,11 +175,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() SvtCommandOptions_Impl::~SvtCommandOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } // public method diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index f91981d..71ed621 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -365,11 +365,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bValue ) diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index f406c8d..1fac595 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -353,11 +353,7 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } // public method diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index bd3f79c..cb46c6d 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -122,11 +122,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl() GlobalEventConfig_Impl::~GlobalEventConfig_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index d7db4b8..1443c73 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -152,11 +152,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } // public method diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index d929b31..3139ce5 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -88,8 +88,7 @@ public: SvtAppFilterOptions_Impl::~SvtAppFilterOptions_Impl() { - if(IsModified()) - Commit(); + assert(!IsModified()); // should have been committed } void SvtAppFilterOptions_Impl::ImplCommit() diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 5766b9a..fa2b52a 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -150,11 +150,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() SvtFontOptions_Impl::~SvtFontOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } // public method diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index f2f2ab1..9707104 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -139,11 +139,7 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() { - // We must save our current values .. if user forget it! - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } // public method diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 7f1b55f..f5ad76c 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -355,22 +355,9 @@ SvtModuleOptions_Impl::SvtModuleOptions_Impl() EnableNotification( lFactories ); } -/*-************************************************************************************************************ - @short default dtor - @descr If any values of our cache was modified we should write it back to configuration. - - @attention Don't forget to call "SetModified()" method of base class ConfigItem if any interface method - of this class modify internal member list m_lFactories! Otherwise Commit() will never be called!!! - - @seealso baseclass ConfigItem - @threadsafe no -*//*-*************************************************************************************************************/ SvtModuleOptions_Impl::~SvtModuleOptions_Impl() { - if( IsModified() ) - { - Commit(); - } + assert(!IsModified()); // should have been committed } /*-************************************************************************************************************ diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 33d61f2..166e845 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -159,8 +159,7 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() { - if( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } // Commit diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 59eae30..76154d8 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -75,7 +75,7 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() : SvtSearchOptions_Impl::~SvtSearchOptions_Impl() { - Commit(); + assert(!IsModified()); // should have been committed } void SvtSearchOptions_Impl::ImplCommit() diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index c235a73..3c00b0e 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -274,8 +274,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl() { - if( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValue, bool bRO ) diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 5a8d107..3ce1851 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -249,8 +249,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl() SvtSysLocaleOptions_Impl::~SvtSysLocaleOptions_Impl() { - if ( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } void SvtSysLocaleOptions_Impl::MakeRealLocale() diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index dd5c327..1e33a48 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -53,8 +53,7 @@ SettingsConfigItem::SettingsConfigItem() SettingsConfigItem::~SettingsConfigItem() { - if( IsModified() ) - Commit(); + assert(!IsModified()); // should have been committed } void SettingsConfigItem::ImplCommit() commit a7b9167235d38130aab1af4bed66b6c48d375fc9 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 11 16:22:01 2015 +0100 framework: reindent that too Change-Id: I963482b0ef1ae726b4f0c45e57ee9a20d44a3ff1 diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4601a66..1e06f28 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -130,35 +130,35 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - // Wrapper methods for low-level functions - OperatingSystem GetOperatingSystem(); - const OUString& GetYPDomainName(); - const OUString& GetDNSDomainName(); - const OUString& GetNTDomainName(); - const OUString& GetHostName(); - - bool FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule ); - - void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< OUString >& aSharePointsSeq ); - void ReadSharePointRuleSetFromConfiguration( const OUString& aSharePointName, - const OUString& aSharePointNodeName, - SubstituteRuleVector& aRuleSet ); - - // Stored values for domains and host - bool m_bYPDomainRetrieved; - OUString m_aYPDomain; - bool m_bDNSDomainRetrieved; - OUString m_aDNSDomain; - bool m_bNTDomainRetrieved; - OUString m_aNTDomain; - bool m_bHostRetrieved; - OUString m_aHost; - - Link m_aListenerNotify; - const OUString m_aSharePointsNodeName; - const OUString m_aDirPropertyName; - const OUString m_aEnvPropertyName; - const OUString m_aLevelSep; + // Wrapper methods for low-level functions + OperatingSystem GetOperatingSystem(); + const OUString& GetYPDomainName(); + const OUString& GetDNSDomainName(); + const OUString& GetNTDomainName(); + const OUString& GetHostName(); + + bool FilterRuleSet(const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule); + + void ReadSharePointsFromConfiguration(com::sun::star::uno::Sequence< OUString >& aSharePointsSeq); + void ReadSharePointRuleSetFromConfiguration(const OUString& aSharePointName, + const OUString& aSharePointNodeName, + SubstituteRuleVector& aRuleSet); + + // Stored values for domains and host + bool m_bYPDomainRetrieved; + OUString m_aYPDomain; + bool m_bDNSDomainRetrieved; + OUString m_aDNSDomain; + bool m_bNTDomainRetrieved; + OUString m_aNTDomain; + bool m_bHostRetrieved; + OUString m_aHost; + + Link m_aListenerNotify; + const OUString m_aSharePointsNodeName; + const OUString m_aDirPropertyName; + const OUString m_aEnvPropertyName; + const OUString m_aLevelSep; }; enum PreDefVariable commit 152a040392e67c68d9addc94e67e9479f71b1853 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 11 16:18:07 2015 +0100 sw: reindent modcfg.hxx Change-Id: I05bc28547700f5ff5473490200348148f98222aa diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 7b1288a..7242ed6 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -61,9 +61,9 @@ class SwRevisionConfig : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - public: - SwRevisionConfig(); - virtual ~SwRevisionConfig(); +public: + SwRevisionConfig(); + virtual ~SwRevisionConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -85,9 +85,9 @@ class SwCompareConfig : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - public: - SwCompareConfig(); - virtual ~SwCompareConfig(); +public: + SwCompareConfig(); + virtual ~SwCompareConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { }; void Load(); @@ -113,9 +113,9 @@ class SwInsertConfig : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - public: - SwInsertConfig(bool bWeb); - virtual ~SwInsertConfig(); +public: + SwInsertConfig(bool bWeb); + virtual ~SwInsertConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -140,9 +140,9 @@ class SwTableConfig : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - public: - SwTableConfig(bool bWeb); - virtual ~SwTableConfig(); +public: + SwTableConfig(bool bWeb); + virtual ~SwTableConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -170,9 +170,9 @@ class SwMiscConfig : public utl::ConfigItem virtual void ImplCommit() SAL_OVERRIDE; - public: - SwMiscConfig(); - virtual ~SwMiscConfig(); +public: + SwMiscConfig(); + virtual ~SwMiscConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); commit dd5a1ca5e476fc9f24936cc227c83a9d1aeab056 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 11 16:17:13 2015 +0100 sw: reindent usrpref.hxx Change-Id: Id946fde82a294de3476fced34520a34c5a79a8ee diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 1ab07b4..1ae841d 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -36,9 +36,9 @@ private: virtual void ImplCommit() SAL_OVERRIDE; - public: - SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent); - virtual ~SwContentViewConfig(); +public: + SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent); + virtual ~SwContentViewConfig(); // utl::ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; @@ -57,9 +57,9 @@ private: virtual void ImplCommit() SAL_OVERRIDE; - public: - SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent); - virtual ~SwLayoutViewConfig(); +public: + SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent); + virtual ~SwLayoutViewConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -75,9 +75,9 @@ private: virtual void ImplCommit() SAL_OVERRIDE; - public: - SwGridConfig(bool bWeb, SwMasterUsrPref& rParent); - virtual ~SwGridConfig(); +public: + SwGridConfig(bool bWeb, SwMasterUsrPref& rParent); + virtual ~SwGridConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -93,9 +93,9 @@ private: virtual void ImplCommit() SAL_OVERRIDE; - public: - SwCursorConfig(SwMasterUsrPref& rParent); - virtual ~SwCursorConfig(); +public: + SwCursorConfig(SwMasterUsrPref& rParent); + virtual ~SwCursorConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); @@ -110,9 +110,9 @@ private: virtual void ImplCommit() SAL_OVERRIDE; - public: - SwWebColorConfig(SwMasterUsrPref& rParent); - virtual ~SwWebColorConfig(); +public: + SwWebColorConfig(SwMasterUsrPref& rParent); + virtual ~SwWebColorConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); commit 765f6211b1371c1e40de386e715de6b3d1a8df86 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 11 16:14:47 2015 +0100 utl::ConfigItem::Commit() should call ClearModified() Rename the virtual function, and add a new non-virtual Commit() to do that. Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022 diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 50f638a..4427b3f 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -42,12 +42,14 @@ bool lcl_IsMetric() class CalcConfigItem : public ::utl::ConfigItem { +private: + virtual void ImplCommit() SAL_OVERRIDE; + public: CalcConfigItem(); virtual ~CalcConfigItem(); FieldUnit getFieldUnit(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; }; @@ -60,7 +62,7 @@ CalcConfigItem::~CalcConfigItem() { } -void CalcConfigItem::Commit() {} +void CalcConfigItem::ImplCommit() {} void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {} FieldUnit CalcConfigItem::getFieldUnit() diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 8b42c9c..3743205 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -61,7 +61,7 @@ public: protected: // ____ ::utl::ConfigItem ____ - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; virtual void Notify( const Sequence< OUString > & aPropertyNames ) SAL_OVERRIDE; private: @@ -86,7 +86,7 @@ void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames ) } } -void ChartConfigItem::Commit() +void ChartConfigItem::ImplCommit() {} void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName ) diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 8c10a9e..8e18319 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 fdfc06f..f7e34fb 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 50e8530..c384de1 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 fdcbb0a..88c2cdb 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() { } diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 9ca989c..cac7cb9 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -236,7 +236,7 @@ SvxBaseAutoCorrCfg::~SvxBaseAutoCorrCfg() { } -void SvxBaseAutoCorrCfg::Commit() +void SvxBaseAutoCorrCfg::ImplCommit() { Sequence<OUString> aNames( GetPropertyNames() ); @@ -321,7 +321,6 @@ void SvxBaseAutoCorrCfg::Commit() } } PutProperties(aNames, aValues); - ClearModified(); } void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */) @@ -546,7 +545,7 @@ SvxSwAutoCorrCfg::~SvxSwAutoCorrCfg() { } -void SvxSwAutoCorrCfg::Commit() +void SvxSwAutoCorrCfg::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -641,7 +640,6 @@ void SvxSwAutoCorrCfg::Commit() } } PutProperties(aNames, aValues); - ClearModified(); } void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ ) diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index c9d0af0..4c7b65c 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -218,7 +218,7 @@ void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& ) { } -void BibConfig::Commit() +void BibConfig::ImplCommit() { const Sequence<OUString> aPropertyNames = GetPropertyNames(); Sequence<Any> aValues(aPropertyNames.getLength()); diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 4bca1a9..23880ed 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -102,11 +102,13 @@ class BibConfig : public utl::ConfigItem OUString aColumnDefaults[COLUMN_COUNT]; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: BibConfig(); virtual ~BibConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; BibDBDescriptor GetBibliographyURL(); diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 52d3997..7c7cce2 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -138,6 +138,8 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem private: HandlerCache* m_pCache; + virtual void ImplCommit() SAL_OVERRIDE; + /* interface */ public: HandlerCFGAccess( const OUString& sPackage ); @@ -146,7 +148,6 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem void setCache(HandlerCache* pCache) {m_pCache = pCache;}; virtual void Notify(const css::uno::Sequence< OUString >& lPropertyNames) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; }; } // namespace framework diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 4f0fcff..5869906 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -182,16 +182,6 @@ class AddonsOptions_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 /*-**************************************************************************************************** @@ -286,6 +276,8 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; + virtual void ImplCommit() SAL_OVERRIDE; + // private member private: @@ -428,9 +420,9 @@ void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ // public method -void AddonsOptions_Impl::Commit() +void AddonsOptions_Impl::ImplCommit() { - OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" ); + SAL_WARN("framework", "AddonsOptions_Impl::ImplCommit(): Not implemented yet!"); } // public method diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 18abfdb..9d71c8c 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -269,7 +269,7 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyN } } -void HandlerCFGAccess::Commit() +void HandlerCFGAccess::ImplCommit() { } diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 98e9b0f..4601a66 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -125,9 +125,11 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; - private: + private: + + virtual void ImplCommit() SAL_OVERRIDE; + // Wrapper methods for low-level functions OperatingSystem GetOperatingSystem(); const OUString& GetYPDomainName(); @@ -458,7 +460,7 @@ void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< // NOT implemented yet! } -void SubstitutePathVariables_Impl::Commit() +void SubstitutePathVariables_Impl::ImplCommit() { } diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index 14e2b69..b0ecbc1 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -26,30 +26,34 @@ class SvxAutoCorrect; class SvxAutoCorrCfg; class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem { +private: SvxAutoCorrCfg& rParent; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); virtual ~SvxBaseAutoCorrCfg(); void Load(bool bInit); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void SetModified() {ConfigItem::SetModified();} }; class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem { +private: SvxAutoCorrCfg& rParent; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); virtual ~SvxSwAutoCorrCfg(); void Load(bool bInit); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void SetModified() {ConfigItem::SetModified();} }; diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index 428e5ca..8c0ea1a 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -98,11 +98,12 @@ private: bool isKeyboardLayoutTypeInstalled(sal_Int16 scriptType) const; + virtual void ImplCommit() SAL_OVERRIDE; + public: SvtSystemLanguageOptions(); virtual ~SvtSystemLanguageOptions(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; LanguageType GetWin16SystemLanguage() const; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 531d95e..2b1eeb6 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -81,6 +81,8 @@ class SVL_DLLPUBLIC SvxSearchItem : bool bContent; // search in content bool bAsianOptions; // use asian options? + virtual void ImplCommit() SAL_OVERRIDE; + public: TYPEINFO_OVERRIDE(); @@ -99,7 +101,6 @@ public: // ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; SvxSearchCmd GetCommand() const { return nCommand; } void SetCommand(SvxSearchCmd nNewCommand) { nCommand = nNewCommand; } diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 973577d3..cb308b8 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 4bac9db..278eb66 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 69d4782b..b263917 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; diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index b30af80..929ffd7 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -101,6 +101,9 @@ namespace utl com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess> GetTree(); + /** writes the changed values into the sub tree. + Private and only called from non-virtual public Commit(). */ + virtual void ImplCommit() = 0; protected: explicit ConfigItem(const OUString &rSubTree, @@ -166,8 +169,7 @@ namespace utl bool IsModified() const { return m_bIsModified;} - /** writes the changed values into the sub tree. Always called in the Dtor of the derived class. */ - virtual void Commit()=0; + void Commit(); bool IsInValueChange() const { return m_nInValueChange > 0;} diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 7185aef..d1cc6fe 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -64,18 +64,20 @@ typedef std::vector< OUString > SupportedEventsVector; class GlobalEventConfig_Impl : public utl::ConfigItem { +private: EventBindingHash m_eventBindingHash; FrameVector m_lFrames; SupportedEventsVector m_supportedEvents; void initBindingInfo(); + virtual void ImplCommit() SAL_OVERRIDE; + public: GlobalEventConfig_Impl( ); virtual ~GlobalEventConfig_Impl( ); void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; - void Commit() SAL_OVERRIDE; void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index 5209597..c64ce01 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -25,15 +25,18 @@ struct SvtFilterOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem { +private: SvtFilterOptions_Impl* pImp; const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SvtFilterOptions(); virtual ~SvtFilterOptions(); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; void Load(); void SetLoadWordBasicCode( bool bFlag ); diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index b721f25..f797898 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -36,12 +36,16 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { + private: std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; void getValues(); SettingsConfigItem(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: virtual ~SettingsConfigItem(); @@ -50,7 +54,6 @@ namespace vcl const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const; void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); - virtual void Commit() SAL_OVERRIDE; }; diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index aa73362..58bfa77 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -969,11 +969,11 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) } -void LngSvcMgr::Commit() +void LngSvcMgr::ImplCommit() { // everything necessary should have already been done by 'SaveCfgSvcs' // called from within 'setConfiguredServices'. - // Also this class usually exits only when the Office i sbeing shutdown. + // Also this class usually exits only when the Office is being shutdown. } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 6b4392e..73822fa 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -134,7 +134,7 @@ class LngSvcMgr : // utl::ConfigItem (to allow for listening of changes of relevant properties) virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; void UpdateAll(); void stopListening(); diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index ab8b697..74e86c9 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -24,13 +24,15 @@ class ScAddInCfg : public utl::ConfigItem { +private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: ScAddInCfg(); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 8e69e76..700e144 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -64,13 +64,15 @@ private: class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { +private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: ScDefaultsCfg(); void SetOptions( const ScDefaultsOptions& rNew ); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index ed6ee85..d080a66 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -27,17 +27,19 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { +private: bool bWK3Flag; double fExcelColScale; double fExcelRowScale; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: ScFilterOptions(); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; bool GetWK3Flag() const { return bWK3Flag; } double GetExcelColScale() const { return fExcelColScale; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index e19de2d..59ce099 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -104,12 +104,14 @@ class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem com::sun::star::uno::Sequence<OUString> GetPropertyNames(); ScFormulaCfg::PropsToIds GetPropNamesToId(); void UpdateFromProperties( const com::sun::star::uno::Sequence<OUString>& rNames ); + + virtual void ImplCommit() SAL_OVERRIDE; + public: ScFormulaCfg(); void SetOptions( const ScFormulaOptions& rNew ); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index b6d2a09..cd82ef0 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -81,6 +81,8 @@ class ScInputCfg : public ScInputOptions, { com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: ScInputCfg(); @@ -88,7 +90,6 @@ public: void OptionsChanged(); // after direct access to SetOptions base class virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; }; #endif diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 88bbc3f..aa9f11c 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -45,7 +45,7 @@ public: void SetCommitLink( const Link& rLink ); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ff4f6ed..ab3fe00 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -74,14 +74,16 @@ private: class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { +private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: ScPrintCfg(); void SetOptions( const ScPrintOptions& rNew ); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx index db6cc34..4b03a47 100644 --- a/sc/source/core/tool/addincfg.cxx +++ b/sc/source/core/tool/addincfg.cxx @@ -37,9 +37,9 @@ ScAddInCfg::ScAddInCfg() : EnableNotification( aNames ); } -void ScAddInCfg::Commit() +void ScAddInCfg::ImplCommit() { - OSL_FAIL("ScAddInCfg shouldn't be modified"); + SAL_WARN("sc", "ScAddInCfg shouldn't be modified"); } void ScAddInCfg::Notify( const uno::Sequence<OUString>& ) diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index c21eef3..cf59651 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -143,7 +143,7 @@ ScDefaultsCfg::ScDefaultsCfg() : } } -void ScDefaultsCfg::Commit() +void ScDefaultsCfg::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index a4db66e..86626d8 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -84,7 +84,7 @@ ScFilterOptions::ScFilterOptions() : } } -void ScFilterOptions::Commit() +void ScFilterOptions::ImplCommit() { // options are never modified from office diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 1480ada..1e0a5f5 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -502,7 +502,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames ) } } -void ScFormulaCfg::Commit() +void ScFormulaCfg::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 27c9fb8..437c047 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -185,7 +185,7 @@ ScInputCfg::ScInputCfg() : } } -void ScInputCfg::Commit() +void ScInputCfg::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 671e6d9..0574517 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -52,7 +52,7 @@ void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /* //TODO: not implemented yet... } -void ScLinkConfigItem::Commit() +void ScLinkConfigItem::ImplCommit() { aCommitLink.Call( this ); } diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 6d02ed9..209b896 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -156,7 +156,7 @@ ScPrintCfg::ScPrintCfg() : } } -void ScPrintCfg::Commit() +void ScPrintCfg::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index c3f85ef..bb89daf 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -54,7 +54,7 @@ SdOptionsItem::~SdOptionsItem() { } -void SdOptionsItem::Commit() +void SdOptionsItem::ImplCommit() { if( IsModified() ) mrParent.Commit( *this ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index a3ce85b..86e4637 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -55,12 +55,13 @@ private: const SdOptionsGeneric& mrParent; + virtual void ImplCommit() SAL_OVERRIDE; + public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index f2e9b81..3b12c54 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -468,7 +468,7 @@ SmSymbolManager & SmMathConfig::GetSymbolManager() } -void SmMathConfig::Commit() +void SmMathConfig::ImplCommit() { Save(); } diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index bcbfe4e..2fe2cdd 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -137,13 +137,14 @@ protected: return const_cast<SmMathConfig*>(this)->GetFontFormatList(); } + virtual void ImplCommit() SAL_OVERRIDE; + public: SmMathConfig(); virtual ~SmMathConfig(); // utl::ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; SmSymbolManager & GetSymbolManager(); void GetSymbols( std::vector< SmSym > &rSymbols ) const; diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 90def9a..843311d 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 d4a38cc..3cca428 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 06d4382..390875f 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 3ddb900..86b26d7 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 87a55d7..5c0808f 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 889ed30..8d2243f 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 bcfacb0..e0cb7d5 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 faaf1d0..45574da 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; diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 35b0d68..6c55776 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -111,7 +111,7 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames() return aNames; } -void SvtTabAppearanceCfg::Commit() +void SvtTabAppearanceCfg::ImplCommit() { const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues(rNames.getLength()); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index d816876..691229a 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -70,6 +70,9 @@ class ColorConfig_Impl : public utl::ConfigItem bool m_bAutoDetectSystemHC; uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); + + virtual void ImplCommit() SAL_OVERRIDE; + public: ColorConfig_Impl(bool bEditMode = false); virtual ~ColorConfig_Impl(); @@ -78,7 +81,6 @@ public: void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; const ColorConfigValue& GetColorConfigValue(ColorConfigEntry eValue) @@ -261,7 +263,7 @@ void ColorConfig_Impl::Notify( const uno::Sequence<OUString>& ) NotifyListeners(0); } -void ColorConfig_Impl::Commit() +void ColorConfig_Impl::ImplCommit() { uno::Sequence < OUString > aColorNames = GetPropertyNames(m_sLoadedScheme); uno::Sequence < beans::PropertyValue > aPropValues(aColorNames.getLength()); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 069d8a2..507fde1 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -76,6 +76,9 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); void FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames); + + virtual void ImplCommit() SAL_OVERRIDE; + public: ExtendedColorConfig_Impl(bool bEditMode = false); virtual ~ExtendedColorConfig_Impl(); @@ -85,7 +88,6 @@ public: //changes the name of the current scheme but doesn't load it! void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} bool ExistsScheme(const OUString& _sSchemeName); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; sal_Int32 GetComponentCount() const; @@ -412,7 +414,7 @@ void ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rProp Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED)); } -void ExtendedColorConfig_Impl::Commit() +void ExtendedColorConfig_Impl::ImplCommit() { if ( m_sLoadedScheme.isEmpty() ) return; diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 57f3a21..a602845 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -98,7 +98,7 @@ void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString > { } -void SvtFontSubstConfig::Commit() +void SvtFontSubstConfig::ImplCommit() { Sequence<OUString> aNames(1); aNames.getArray()[0] = cReplacement; diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index e0727ad..972f9a0 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -60,12 +60,13 @@ class SvtHelpOptions_Impl : public utl::ConfigItem Sequence< OUString > GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SvtHelpOptions_Impl(); virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames); - virtual void Commit() SAL_OVERRIDE; void SetExtendedHelp( bool b ) { bExtendedHelp= b; SetModified(); } bool IsExtendedHelp() const { return bExtendedHelp; } @@ -215,7 +216,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) -void SvtHelpOptions_Impl::Commit() +void SvtHelpOptions_Impl::ImplCommit() { Sequence< OUString > aNames = GetPropertyNames(); Sequence< Any > aValues( aNames.getLength() ); diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index b42eeaa..94a51b6 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -190,7 +190,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) } -void SvxHtmlOptions::Commit() +void SvxHtmlOptions::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index a295fc4..60d931a6 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -107,17 +107,6 @@ class SvtMenuOptions_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 @@ -148,6 +137,8 @@ class SvtMenuOptions_Impl : public ConfigItem private: + virtual void ImplCommit() SAL_OVERRIDE; + /*-**************************************************************************************************** @short return list of fix key names of our configuration management which represent our module tree @descr These methods return a static const list of key names. We need it to get needed values from our @@ -306,7 +297,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) // public method -void SvtMenuOptions_Impl::Commit() +void SvtMenuOptions_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/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 8f25929c..9d4fcaf 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -90,6 +90,8 @@ class SvtMiscOptions_Impl : public ConfigItem bool m_bMacroRecorderMode; bool m_bIconThemeWasSetAutomatically; + virtual void ImplCommit() SAL_OVERRIDE; + public: SvtMiscOptions_Impl(); @@ -114,17 +116,6 @@ class SvtMiscOptions_Impl : public ConfigItem */ void Load( const Sequence< OUString >& rPropertyNames ); - /*-**************************************************************************************************** - @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 @@ -576,7 +567,7 @@ void SvtMiscOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) // public method -void SvtMiscOptions_Impl::Commit() +void SvtMiscOptions_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/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 3253005..1e398d9 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -168,8 +168,6 @@ public: // override methods of baseclass - - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; @@ -222,18 +220,16 @@ public: void SetTransparentSelection( bool bState ); void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - // private methods - private: - static Sequence< OUString > impl_GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + static Sequence< OUString > impl_GetPropertyNames(); // private member - private: bool m_bOverlayBuffer; @@ -554,7 +550,7 @@ SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() // Commit -void SvtOptionsDrawinglayer_Impl::Commit() +void SvtOptionsDrawinglayer_Impl::ImplCommit() { Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); Sequence< Any > aSeqValues( aSeqNames.getLength() ); diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 74586f3..cf0e0c6 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -73,15 +73,6 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem */ void Load( const Sequence< OUString >& rPropertyNames ); - /** write changes to configuration - - These method writes the changed values into the sub tree - and should always called in our destructor to guarantee consistency of config data. - - \sa baseclass ConfigItem - */ - virtual void Commit() SAL_OVERRIDE; - // public interface bool m_bVisibleImpressView; bool m_bVisibleOutlineView; @@ -91,6 +82,8 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem bool m_bVisibleDrawView; private: + virtual void ImplCommit() SAL_OVERRIDE; + /** return list of key names of our configuration management which represent oue module tree These methods return a static const list of key names. We need it to get needed values from our @@ -257,7 +250,7 @@ void SvtSlideSorterBarOptions_Impl::Notify( const Sequence< OUString >& rPropert Load( rPropertyNames ); } -void SvtSlideSorterBarOptions_Impl::Commit() +void SvtSlideSorterBarOptions_Impl::ImplCommit() { // Get names of supported properties, create a list for values and copy current values to it. sal_Int32 nCount = m_seqPropertyNames.getLength(); diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index c5ec8c7..4934eeb 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -78,15 +78,6 @@ class SvtToolPanelOptions_Impl : public ConfigItem */ void Load( const Sequence< OUString >& rPropertyNames ); - /** write changes to configuration - - These method writes the changed values into the sub tree - and should always called in our destructor to guarantee consistency of config data. - - \sa baseclass ConfigItem - */ - virtual void Commit() SAL_OVERRIDE; - // public interface bool m_bVisibleImpressView; bool m_bVisibleOutlineView; @@ -95,6 +86,9 @@ class SvtToolPanelOptions_Impl : public ConfigItem bool m_bVisibleSlideSorterView; private: + + virtual void ImplCommit() SAL_OVERRIDE; + /** return list of key names of our configuration management which represent oue module tree These methods return a static const list of key names. We need it to get needed values from our @@ -247,7 +241,7 @@ void SvtToolPanelOptions_Impl::Notify( const Sequence< OUString >& rPropertyName Load( rPropertyNames ); } -void SvtToolPanelOptions_Impl::Commit() +void SvtToolPanelOptions_Impl::ImplCommit() { // Get names of supported properties, create a list for values and copy current values to it. sal_Int32 nCount = m_seqPropertyNames.getLength(); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 9afee24..57a3895 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -280,9 +280,9 @@ public: virtual void setCommand(const OUString& _rCommand) SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; private: + virtual void ImplCommit() SAL_OVERRIDE; void clearFieldAssignment(const OUString& _rLogicalName); }; @@ -291,7 +291,7 @@ void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<OUStr { } -void AssignmentPersistentData::Commit() +void AssignmentPersistentData::ImplCommit() { } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 10ff710..f41cfac 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3580,7 +3580,7 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPr } } -void FmXFormShell::Commit() +void FmXFormShell::ImplCommit() { } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index bf057cc..b274ae4 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -490,7 +490,6 @@ private: // ConfigItem related stuff SAL_DLLPRIVATE virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual void Commit() SAL_OVERRIDE; SAL_DLLPRIVATE void implAdjustConfigCache(); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > @@ -517,6 +516,7 @@ private: */ SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + SAL_DLLPRIVATE virtual void ImplCommit() SAL_OVERRIDE; // asynchronous cursor actions/navigation slot handling diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index f8bb42d..f72357a 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -99,6 +99,9 @@ class SwNoteProps: public utl::ConfigItem { private: bool bIsShowAnchor; + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwNoteProps() : ConfigItem(OUString("Office.Writer/Notes")) @@ -128,7 +131,6 @@ class SwNoteProps: public utl::ConfigItem return aNames; } - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index a506db9..7b1288a 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();} diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index a304772..c610a13 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -24,14 +24,17 @@ class SwPrintOptions : public SwPrintData, public utl::ConfigItem { +private: bool bIsWeb; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwPrintOptions(bool bWeb); virtual ~SwPrintOptions(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; virtual void doSetModified( ) SAL_OVERRIDE { bModified = true; SetModified();} diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx index afc0050..b7ebce5 100644 --- a/sw/inc/swfltopt.hxx +++ b/sw/inc/swfltopt.hxx @@ -23,13 +23,15 @@ class SW_DLLPUBLIC SwFilterOptions : public utl::ConfigItem { +private: + virtual void ImplCommit() SAL_OVERRIDE; + public: SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ); void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 03e62ca..9108f09 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1118,7 +1118,7 @@ namespace numfunc /** catches notification about changed default bullet configuration data */ virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; // default bullet list configuration data OUString msFontname; @@ -1279,7 +1279,7 @@ namespace numfunc InitFont(); } - void SwDefBulletConfig::Commit() + void SwDefBulletConfig::ImplCommit() { } @@ -1333,7 +1333,7 @@ namespace numfunc /** catches notification about changed configuration data */ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; // configuration data bool mbChangeIndentOnTabAtFirstPosOfFirstListItem; @@ -1374,7 +1374,7 @@ namespace numfunc return aPropNames; } - void SwNumberingUIBehaviorConfig::Commit() {} + void SwNumberingUIBehaviorConfig::ImplCommit() {} void SwNumberingUIBehaviorConfig::LoadConfig() { diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 786d9f2..1f841da 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -72,12 +72,13 @@ private: sal_Int32 m_nLRU_InitSize; uno::Sequence< OUString > GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SwOLELRUCache(); virtual void Notify( const uno::Sequence< OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; void Load(); void InsertObj( SwOLEObj& rObj ); @@ -921,7 +922,7 @@ void SwOLELRUCache::Notify( const uno::Sequence< OUString>& ) Load(); } -void SwOLELRUCache::Commit() +void SwOLELRUCache::ImplCommit() { } diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 3d909bf..029c1b4 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -277,7 +277,7 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, } } -void SwFilterOptions::Commit() {} +void SwFilterOptions::ImplCommit() {} void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void StgReader::SetFltName( const OUString& rFltNm ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index a270d29..bbb5579 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1505,7 +1505,7 @@ static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames) void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwInsertDBColAutoPilot::Commit() +void SwInsertDBColAutoPilot::ImplCommit() { Sequence <OUString> aNames = GetNodeNames(OUString()); const OUString* pNames = aNames.getArray(); diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx index f9c4db5..d0b8ce3 100644 --- a/sw/source/uibase/config/barcfg.cxx +++ b/sw/source/uibase/config/barcfg.cxx @@ -110,7 +110,7 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames() return aNames; } -void SwToolbarConfigItem::Commit() +void SwToolbarConfigItem::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx index cad668f..d3114c8 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -110,7 +110,7 @@ const SwDBData& SwDBConfig::GetBibliographySource() return *pBibImpl; } -void SwDBConfig::Commit() {} +void SwDBConfig::ImplCommit() {} void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 7fbd527..53971f9 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -131,7 +131,7 @@ SwStdFontConfig::SwStdFontConfig() : } } -void SwStdFontConfig::Commit() +void SwStdFontConfig::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 8176a79..52a97e2 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -291,7 +291,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwRevisionConfig::Commit() +void SwRevisionConfig::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -633,7 +633,7 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwInsertConfig::Commit() +void SwInsertConfig::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -1134,7 +1134,7 @@ SwTableConfig::~SwTableConfig() void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwTableConfig::Commit() +void SwTableConfig::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -1236,7 +1236,7 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwMiscConfig::Commit() +void SwMiscConfig::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -1340,7 +1340,7 @@ SwCompareConfig::~SwCompareConfig() { } -void SwCompareConfig::Commit() +void SwCompareConfig::ImplCommit() { const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index a8c0074..e3c8cb2 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -127,7 +127,7 @@ SwPrintOptions::~SwPrintOptions() void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwPrintOptions::Commit() +void SwPrintOptions::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 49e353b..017d885 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -127,7 +127,7 @@ void SwContentViewConfig::Notify( const Sequence< OUString > & /*rPropertyNames* Load(); } -void SwContentViewConfig::Commit() +void SwContentViewConfig::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -259,7 +259,7 @@ SwLayoutViewConfig::~SwLayoutViewConfig() { } -void SwLayoutViewConfig::Commit() +void SwLayoutViewConfig::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -394,7 +394,7 @@ SwGridConfig::~SwGridConfig() { } -void SwGridConfig::Commit() +void SwGridConfig::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -479,7 +479,7 @@ SwCursorConfig::~SwCursorConfig() { } -void SwCursorConfig::Commit() +void SwCursorConfig::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -544,7 +544,7 @@ SwWebColorConfig::~SwWebColorConfig() { } -void SwWebColorConfig::Commit() +void SwWebColorConfig::ImplCommit() { Sequence<Any> aValues(aPropNames.getLength()); Any* pValues = aValues.getArray(); diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 12e1465..461c68c 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -151,11 +151,12 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem const Sequence< OUString>& GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SwMailMergeConfigItem_Impl(); virtual ~SwMailMergeConfigItem_Impl(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const Sequence< OUString> GetAddressBlocks(bool bConvertToConfig = false) const; @@ -490,7 +491,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames() void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwMailMergeConfigItem_Impl::Commit() +void SwMailMergeConfigItem_Impl::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index cbd5f2f..54647e0 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2144,7 +2144,7 @@ void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm, } } -void SwNoteProps::Commit() {} +void SwNoteProps::ImplCommit() {} void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index 9975522..d215a2d 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -236,7 +236,7 @@ SwEnvCfgItem::~SwEnvCfgItem() { } -void SwEnvCfgItem::Commit() +void SwEnvCfgItem::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index 947540b..e9197ab 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -169,7 +169,7 @@ SwLabelConfig::~SwLabelConfig() } // the config item is not writable ?: -void SwLabelConfig::Commit() {} +void SwLabelConfig::ImplCommit() {} void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index 2a2922b..0671075 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -396,7 +396,7 @@ SwLabCfgItem::SwLabCfgItem(bool bLabel) : void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -void SwLabCfgItem::Commit() +void SwLabCfgItem::ImplCommit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx index 1d7507c..cdb0897 100644 --- a/sw/source/uibase/inc/barcfg.hxx +++ b/sw/source/uibase/inc/barcfg.hxx @@ -26,11 +26,12 @@ class SwToolbarConfigItem : public utl::ConfigItem com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SwToolbarConfigItem( bool bWeb ); virtual ~SwToolbarConfigItem(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx index 16f0481..55251ee 100644 --- a/sw/source/uibase/inc/dbconfig.hxx +++ b/sw/source/uibase/inc/dbconfig.hxx @@ -26,7 +26,9 @@ struct SwDBData; class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem { +private: SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; SwDBData* pAdrImpl; SwDBData* pBibImpl; @@ -38,7 +40,6 @@ public: void Load(); const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index f156ebe..e48f422 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -145,7 +145,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; + virtual void ImplCommit() SAL_OVERRIDE; void Load(); // set the tables - properties diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index 40fe1e4..fd9a04f 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -69,16 +69,19 @@ public: class SwEnvCfgItem : public utl::ConfigItem { +private: SwEnvItem aEnvItem; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwEnvCfgItem(); virtual ~SwEnvCfgItem(); SwEnvItem& GetItem() {return aEnvItem;} - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx index 8bd7844..77aa2a6 100644 --- a/sw/source/uibase/inc/fontcfg.hxx +++ b/sw/source/uibase/inc/fontcfg.hxx @@ -71,11 +71,12 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight ); + virtual void ImplCommit() SAL_OVERRIDE; + public: SwStdFontConfig(); virtual ~SwStdFontConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx index 0a8a162..5f47a4b 100644 --- a/sw/source/uibase/inc/labelcfg.hxx +++ b/sw/source/uibase/inc/labelcfg.hxx @@ -34,14 +34,16 @@ struct SwLabelMeasure class SW_DLLPUBLIC SwLabelConfig : public utl::ConfigItem { +private: std::vector<OUString> m_aManufacturers; std::map< OUString, std::map<OUString, SwLabelMeasure> > m_aLabels; + virtual void ImplCommit() SAL_OVERRIDE; + public: SwLabelConfig(); virtual ~SwLabelConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index dad4ae7..c278c55 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -105,16 +105,19 @@ public: class SwLabCfgItem : public utl::ConfigItem { +private: SwLabItem aItem; bool bIsLabel; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwLabCfgItem(bool bLabel); SwLabItem& GetItem() {return aItem;} - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx index 1a3a6fa..06a3c4e 100644 --- a/sw/source/uibase/inc/navicfg.hxx +++ b/sw/source/uibase/inc/navicfg.hxx @@ -33,11 +33,12 @@ class SwNavigationConfig : public utl::ConfigItem com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + virtual void ImplCommit() SAL_OVERRIDE; + public: SwNavigationConfig(); virtual ~SwNavigationConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; sal_Int32 GetRootType()const {return nRootType;} diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 362003c..1ab07b4 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -28,17 +28,20 @@ class SwMasterUsrPref; class SwContentViewConfig : public utl::ConfigItem { +private: SwMasterUsrPref& rParent; bool bWeb; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwContentViewConfig(); // utl::ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -46,30 +49,36 @@ class SwContentViewConfig : public utl::ConfigItem class SwLayoutViewConfig : public utl::ConfigItem { +private: SwMasterUsrPref& rParent; bool bWeb; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwLayoutViewConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; class SwGridConfig : public utl::ConfigItem { +private: SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwGridConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwGridConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -77,14 +86,17 @@ class SwGridConfig : public utl::ConfigItem class SwCursorConfig : public utl::ConfigItem { +private: SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + + virtual void ImplCommit() SAL_OVERRIDE; + public: SwCursorConfig(SwMasterUsrPref& rParent); virtual ~SwCursorConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -92,14 +104,16 @@ class SwCursorConfig : public utl::ConfigItem class SwWebColorConfig : public utl::ConfigItem { +private: SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<OUString> aPropNames; + virtual void ImplCommit() SAL_OVERRIDE; + public: SwWebColorConfig(SwMasterUsrPref& rParent); virtual ~SwWebColorConfig(); - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits