strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impressodf12 (1.86.12); FILE MERGED

Browse source 
2008/05/26 12:27:04 cl 1.86.12.1: #i35937# code cleanup after bullet rework
This commit is contained in:
Rüdiger Timm 2008-06-06 10:56:39 +00:00
parent 6e83aa5763
commit dfc8833f9b
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sd/source/core/drawdoc.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: drawdoc.cxx,v $ * $RCSfile: drawdoc.cxx,v $
* $Revision: 1.86 $ * $Revision: 1.87 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -682,7 +682,6 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// dokumentspezifisch wie StyleSheetPool und StyleRequestHandler // dokumentspezifisch wie StyleSheetPool und StyleRequestHandler
::Outliner& rDrawOutliner = GetDrawOutliner(); ::Outliner& rDrawOutliner = GetDrawOutliner();
rDrawOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); rDrawOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
rDrawOutliner.SetMinDepth(0);
ULONG nCntrl = rDrawOutliner.GetControlWord(); ULONG nCntrl = rDrawOutliner.GetControlWord();
if (mbOnlineSpell) if (mbOnlineSpell)
nCntrl |= EE_CNTRL_ONLINESPELLING; nCntrl |= EE_CNTRL_ONLINESPELLING;
@ -694,17 +693,14 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// aber nicht den globalen Outliner, den der ist ja nicht // aber nicht den globalen Outliner, den der ist ja nicht
// dokumentspezifisch wie StyleSheetPool und StyleRequestHandler // dokumentspezifisch wie StyleSheetPool und StyleRequestHandler
pHitTestOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); pHitTestOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
pHitTestOutliner->SetMinDepth(0);
if(mpOutliner) if(mpOutliner)
{ {
mpOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); mpOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
mpOutliner->SetMinDepth(0);
} }
if(mpInternalOutliner) if(mpInternalOutliner)
{ {
mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
mpInternalOutliner->SetMinDepth(0);
} }
if ( eMode == DOC_LOADED ) if ( eMode == DOC_LOADED )
@ -859,7 +855,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if (aString.Len()) if (aString.Len())
{ {
sd::Outliner* pInternalOutl = GetInternalOutliner(TRUE); sd::Outliner* pInternalOutl = GetInternalOutliner(TRUE);
pInternalOutl->SetMinDepth(0);
pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString ); pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE ); pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
pInternalOutl->Clear(); pInternalOutl->Clear();
@ -892,7 +887,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
mpOutliner->SetDefTab( nDefaultTabulator ); mpOutliner->SetDefTab( nDefaultTabulator );
mpOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); mpOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
mpOutliner->SetMinDepth(0);
} }
return(mpOutliner); return(mpOutliner);
@ -924,7 +918,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
mpInternalOutliner->SetDefTab( nDefaultTabulator ); mpInternalOutliner->SetDefTab( nDefaultTabulator );
mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
mpInternalOutliner->SetMinDepth(0);
} }
DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == FALSE ) , "InternalOutliner: UpdateMode = TRUE !" ); DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == FALSE ) , "InternalOutliner: UpdateMode = TRUE !" );