diff options
author | Noel Grandin <noel@peralex.com> | 2014-07-09 13:43:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-10 11:04:13 +0200 |
commit | bc30f938c0d27ee1ae20b0c10d3d8840557b2e93 (patch) | |
tree | 0a77d8983bcb74f763e08fc0f35b6c0d478416db /store/source/object.hxx | |
parent | use SimpleReferenceObject in StgPage (diff) | |
download | core-bc30f938c0d27ee1ae20b0c10d3d8840557b2e93.tar.gz core-bc30f938c0d27ee1ae20b0c10d3d8840557b2e93.zip |
use SimpleReferenceObject in stoc module
to replace hand-rolled version
Change-Id: I30635aec81313e4e0d1b67b30c8992fd63bb1f67
Diffstat (limited to 'store/source/object.hxx')
-rw-r--r-- | store/source/object.hxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/store/source/object.hxx b/store/source/object.hxx index 2743bfdc692d..2b93a6f90a6a 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -21,10 +21,9 @@ #define INCLUDED_STORE_SOURCE_OBJECT_HXX #include "sal/types.h" - #include "rtl/ref.hxx" - #include "osl/interlck.h" +#include "salhelper/simplereferenceobject.hxx" namespace store { @@ -34,7 +33,7 @@ namespace store * IStoreHandle interface. * *======================================================================*/ -class IStoreHandle : public rtl::IReference +class IStoreHandle : public virtual salhelper::SimpleReferenceObject { public: /** Replaces dynamic_cast type checking. @@ -42,7 +41,7 @@ public: virtual bool isKindOf (sal_uInt32 nTypeId) = 0; protected: - ~IStoreHandle() {} + virtual ~IStoreHandle() {} }; /** Template helper function as dynamic_cast replacement. @@ -66,26 +65,16 @@ class OStoreObject : public store::IStoreHandle public: /** Construction. */ - OStoreObject (void); - - /** Allocation. - */ - static void* operator new (size_t n); - static void operator delete (void *p); + OStoreObject() {} /** IStoreHandle. */ virtual bool isKindOf (sal_uInt32 nTypeId) SAL_OVERRIDE; - /** IReference. - */ - virtual oslInterlockedCount SAL_CALL acquire (void) SAL_OVERRIDE; - virtual oslInterlockedCount SAL_CALL release (void) SAL_OVERRIDE; - protected: /** Destruction. */ - virtual ~OStoreObject (void); + virtual ~OStoreObject() {} private: /** The IStoreHandle TypeId. |