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 /sw/source | |
| 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 'sw/source')
| -rw-r--r-- | sw/source/ui/app/docstyle.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 0cbf32ed6990..810021d144f5 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -386,7 +386,7 @@ void SwPoolFmtList::Erase() SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, const String& rName, - SwDocStyleSheetPool& _rPool, + SwDocStyleSheetPool* _rPool, SfxStyleFamily eFam, sal_uInt16 _nMask) : @@ -612,7 +612,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) { String aItemPresentation; if ( !IsInvalidItem( pItem ) && - rPool.GetPool().GetPresentation( + pPool->GetPool().GetPresentation( *pItem, SFX_ITEM_PRESENTATION_COMPLETE, eUnit, aItemPresentation, &aIntlWrapper ) ) { @@ -660,7 +660,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) { String aItemPresentation; if ( !IsInvalidItem( pItem ) && - rPool.GetPool().GetPresentation( + pPool->GetPool().GetPresentation( *pItem, SFX_ITEM_PRESENTATION_COMPLETE, eUnit, aItemPresentation, &aIntlWrapper ) ) { @@ -868,8 +868,8 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) if( bChg ) { - rPool.First(); // internal list has to be updated - rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); + pPool->First(); // internal list has to be updated + pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); SwEditShell* pSh = rDoc.GetEditShell(); if( pSh ) pSh->CallChgLnk(); @@ -924,7 +924,7 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr) if( bRet ) { aParent = rStr; - rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, + pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); } } @@ -2019,7 +2019,7 @@ void SwDocStyleSheet::SetHelpId( const String& r, sal_uLong nId ) SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg ) : SfxStyleSheetBasePool( rDocument.GetAttrPool() ) -, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, *this, SFX_STYLE_FAMILY_CHAR, 0 ) ) +, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) ) , rDoc( rDocument ) { bOrganizer = bOrg; @@ -2378,8 +2378,8 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName, SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase, SfxStyleFamily eFam, sal_uInt16 n ) : SfxStyleSheetIterator( pBase, eFam, n ), - mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, *pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), - mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, *pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) + mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), + mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) { bFirstCalled = sal_False; nLastPos = 0; |