diff options
Diffstat (limited to 'framework')
4 files changed, 12 insertions, 17 deletions
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 52d3997c3ad9..7c7cce222685 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 4f0fcff181b2..58699066b38a 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 18abfdbbe508..9d71c8c38428 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 98e9b0f6d339..4601a662cd35 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() { } |