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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 373b8d105d25..d88e2e0689bf 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -209,7 +209,7 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName) { if( rParentName.Len() ) { - SfxStyleSheetBase* pStyle = rPool.Find(rParentName, nFamily); + SfxStyleSheetBase* pStyle = pPool->Find(rParentName, nFamily); if (pStyle) { bResult = sal_True; @@ -402,7 +402,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const String aRealStyle; String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR )); SdStyleSheet* pRealStyle = NULL; - SdDrawDocument* pDoc = ((SdStyleSheetPool&) rPool).GetDoc(); + SdDrawDocument* pDoc = ((SdStyleSheetPool*)pPool)->GetDoc(); ::sd::DrawViewShell* pDrawViewShell = 0; @@ -433,7 +433,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const { // Noch keine Seite vorhanden // Dieses kann beim Aktualisieren vonDokumentvorlagen vorkommen - SfxStyleSheetIterator aIter(&rPool, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE); SfxStyleSheetBase* pSheet = aIter.First(); if( pSheet ) aRealStyle = pSheet->GetName(); @@ -479,12 +479,12 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const } aRealStyle += aInternalName; - pRealStyle = static_cast< SdStyleSheet* >( rPool.Find(aRealStyle, SD_STYLE_FAMILY_MASTERPAGE) ); + pRealStyle = static_cast< SdStyleSheet* >( pPool->Find(aRealStyle, SD_STYLE_FAMILY_MASTERPAGE) ); #ifdef DBG_UTIL if( !pRealStyle ) { - SfxStyleSheetIterator aIter(&rPool, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE); if( aIter.Count() > 0 ) // StyleSheet not found, but pool already loaded DBG_ASSERT(pRealStyle, "Internal StyleSheet not found"); @@ -540,7 +540,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const } } - pPseudoStyle = static_cast<SdStyleSheet*>(rPool.Find(aStyleName, SD_STYLE_FAMILY_PSEUDO)); + pPseudoStyle = static_cast<SdStyleSheet*>(pPool->Find(aStyleName, SD_STYLE_FAMILY_PSEUDO)); DBG_ASSERT(pPseudoStyle, "PseudoStyleSheet nicht gefunden"); return pPseudoStyle; |