diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-03 12:43:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-03 12:44:57 +0100 |
| commit | d1420b9235649af5cbba8f515c69afc362e09b1c (patch) | |
| tree | 8a140b38d88d0a90408cb35d9145d789e38a49fc | |
| parent | 0daa1c539ccfd876621294907e09b775338a7b44 (diff) | |
revert this, reported windows bustage
| -rw-r--r-- | svl/inc/svl/style.hxx | 1 | ||||
| -rw-r--r-- | svl/source/items/style.cxx | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index c948c58043ce..ceb8050f31c8 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -100,6 +100,7 @@ protected: sal_Bool bMySet; // sal_True: Set loeschen im dtor + SfxStyleSheetBase(); // do not use! 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 595ed7b41ae8..2a1929e78fb0 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -154,6 +154,25 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r ) pSet = NULL; } +static SfxStyleSheetBasePool& implGetStaticPool() +{ + static SfxStyleSheetBasePool* pSheetPool = 0; + static SfxItemPool* pBasePool = 0; + if( !pSheetPool ) + { + UniString aName; + pBasePool = new SfxItemPool( aName, 0, 0, 0 ); + pSheetPool = new SfxStyleSheetBasePool(*pBasePool); + } + return *pSheetPool; +} + +SfxStyleSheetBase::SfxStyleSheetBase() +: comphelper::OWeakTypeObject() +, rPool( implGetStaticPool() ) +{ +} + SfxStyleSheetBase::~SfxStyleSheetBase() { #ifdef DBG_UTIL |