diff options
Diffstat (limited to 'svl')
-rw-r--r-- | svl/inc/svl/style.hxx | 8 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 02e4a127ab34..5fe0d0b217b4 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -84,7 +84,9 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from: class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject { +private: friend class SfxStyleSheetBasePool; + SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool(); protected: SfxStyleSheetBasePool& rPool; // zugehoeriger Pool @@ -100,7 +102,11 @@ protected: sal_Bool bMySet; // sal_True: Set loeschen im dtor - SfxStyleSheetBase(); // do not use! + SfxStyleSheetBase() // do not use! + : comphelper::OWeakTypeObject() + , rPool( implGetStaticPool() ) + { + } SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); virtual ~SfxStyleSheetBase(); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index c3e11e16d3d8..2b3808013217 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -146,7 +146,7 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r ) pSet = NULL; } -static SfxStyleSheetBasePool& implGetStaticPool() +SfxStyleSheetBasePool& SfxStyleSheetBase::implGetStaticPool() { static SfxStyleSheetBasePool* pSheetPool = 0; static SfxItemPool* pBasePool = 0; @@ -159,12 +159,6 @@ static SfxStyleSheetBasePool& implGetStaticPool() return *pSheetPool; } -SfxStyleSheetBase::SfxStyleSheetBase() -: comphelper::OWeakTypeObject() -, rPool( implGetStaticPool() ) -{ -} - SfxStyleSheetBase::~SfxStyleSheetBase() { #ifdef DBG_UTIL |