diff options
author | Noel Grandin <noel@peralex.com> | 2014-07-08 16:23:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-10 11:04:11 +0200 |
commit | df906cf2acffac4a4611f8b34724cdbcda068c74 (patch) | |
tree | d28bb9588fe96d93159593ad1d6730c1b9f1481b /forms/source/richtext/rtattributehandler.hxx | |
parent | use SimpleReferenceObject in fpicker module (diff) | |
download | core-df906cf2acffac4a4611f8b34724cdbcda068c74.tar.gz core-df906cf2acffac4a4611f8b34724cdbcda068c74.zip |
use SimpleReferenceObject in forms module
to replace hand-rolled version
Change-Id: Ic95f4dfd1ae5ab414c68c52ad58c738f4ac1d9d1
Diffstat (limited to 'forms/source/richtext/rtattributehandler.hxx')
-rw-r--r-- | forms/source/richtext/rtattributehandler.hxx | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 9cbc60e33bce..881ec2d2ed8f 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -24,6 +24,7 @@ #include <rtl/ref.hxx> #include <editeng/svxenum.hxx> #include <editeng/frmdir.hxx> +#include <salhelper/simplereferenceobject.hxx> class SfxItemSet; class SfxPoolItem; @@ -32,21 +33,7 @@ class SfxItemPool; namespace frm { - class ReferenceBase : public ::rtl::IReference - { - protected: - oslInterlockedCount m_refCount; - - public: - // IReference - virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; - virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; - - protected: - virtual ~ReferenceBase(); - }; - - class IAttributeHandler : public ::rtl::IReference + class IAttributeHandler : public salhelper::SimpleReferenceObject { public: virtual AttributeId getAttributeId( ) const = 0; @@ -54,11 +41,10 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const = 0; protected: - ~IAttributeHandler() {} + virtual ~IAttributeHandler() {} }; - class AttributeHandler :public ReferenceBase - ,public IAttributeHandler + class AttributeHandler : public IAttributeHandler { private: AttributeId m_nAttribute; @@ -86,10 +72,6 @@ namespace frm // pseudo-abstract virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const; - // disambiguate IReference - virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; - virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; - protected: virtual ~AttributeHandler(); }; |