diff options
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/configitem.hxx | 6 | ||||
-rw-r--r-- | include/unotools/eventcfg.hxx | 4 | ||||
-rw-r--r-- | include/unotools/fltrcfg.hxx | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index b30af8083d4e..929ffd74e3bb 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 7185aef49695..d1cc6fe95e30 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 520959763eea..c64ce01be72b 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 ); |