diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-27 16:18:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-28 10:56:58 +0000 |
| commit | f1857d76cb4d770fe6e0055bb14fa16e081e93f4 (patch) | |
| tree | 226fee0cc0325eae6500ef4b9058a768b10451f7 /svl/inc | |
| parent | cb5bd5a1aea6bb26efa664f5757136915a59f254 (diff) | |
SfxStyleSheet needs a default ctor
due to use of ImplInheritanceHelper2 SfxStyleSheet needs a default ctor, though
its never called. rearrange things a little so we can have an empty ctor
without pulling in a bunch of code which is never executed
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/style.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 3cc136a12eb3..64f28a5db09e 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -87,7 +87,7 @@ private: SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool(); protected: - SfxStyleSheetBasePool& rPool; // zugehoeriger Pool + SfxStyleSheetBasePool* pPool; // zugehoeriger Pool SfxStyleFamily nFamily; // Familie UniString aName, aParent, aFollow; @@ -100,12 +100,7 @@ protected: sal_Bool bMySet; // sal_True: Set loeschen im dtor - SfxStyleSheetBase() // do not use! - : comphelper::OWeakTypeObject() - , rPool( implGetStaticPool() ) - { - } - SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask ); + SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); virtual ~SfxStyleSheetBase(); virtual void Load( SvStream&, sal_uInt16 ); @@ -140,7 +135,7 @@ public: virtual UniString GetDescription(); virtual UniString GetDescription( SfxMapUnit eMetric ); - SfxStyleSheetBasePool& GetPool() { return rPool; } + SfxStyleSheetBasePool& GetPool() { return *pPool; } SfxStyleFamily GetFamily() const { return nFamily; } sal_uInt16 GetMask() const { return nMask; } void SetMask( sal_uInt16 mask) { nMask = mask; } @@ -289,7 +284,12 @@ public: virtual sal_Bool SetParent( const UniString& ); protected: - SfxStyleSheet() {} // do not use! needed by MSVC + SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 + : SfxStyleSheetBase(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dummy")), + NULL, SFX_STYLE_FAMILY_ALL, 0) + { + assert(false); + } virtual ~SfxStyleSheet(); }; |