diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 14:54:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 14:54:37 +0000 |
| commit | 6cdf1330b6b314dd3daa22ed29f508e7ca86ba5e (patch) | |
| tree | 8f50170c421f6f8eb5a1fac12ab1fe552f91d3b3 /sd/source/ui/view/drviews2.cxx | |
| parent | 26f9d8e2e7c5f6e57621fe80dd0fe0844d47fde2 (diff) | |
INTEGRATION: CWS interop12 (1.20.76); FILE MERGED
2004/02/13 21:27:09 cl 1.20.76.4: RESYNC: (1.23-1.26); FILE MERGED
2003/12/09 23:06:59 cl 1.20.76.3: RESYNC: (1.20-1.23); FILE MERGED
2003/11/05 17:05:58 cl 1.20.76.2: #i20949# added support for header&footer
2003/09/19 14:38:27 cl 1.20.76.1: #111385# initial version
Diffstat (limited to 'sd/source/ui/view/drviews2.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 7b5a4819feb8..50db45bd8874 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews2.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-02-04 10:18:42 $ + * last change: $Author: rt $ $Date: 2004-03-30 15:54:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -549,7 +549,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdPage* pPage = GetDoc()->GetSdPage(0, PK_STANDARD); if (GetDoc()->GetSdPageCount(PK_STANDARD) == 1 && pPage->GetAutoLayout() == AUTOLAYOUT_TITLE && - pPage->GetPresObjList()->Count() == 0) + pPage->GetPresObjList().empty()) { // Nur eine Seite vorhanden pPage->SetAutoLayout(AUTOLAYOUT_NONE); @@ -1062,15 +1062,14 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // pDrView->SetAttributes( *pSet, TRUE ) verloren gehen und spaeter restauriert // werden muessen List* pAttrList = new List(); - List* pPresObjList = ( (SdPage*) pDrView->GetPageViewPvNum(0)->GetPage() ) - ->GetPresObjList(); + SdPage* pPresPage = (SdPage*) pDrView->GetPageViewPvNum(0)->GetPage(); ULONG i; for ( i = 0; i < nCount; i++ ) { SdrObject* pObj = rMarkList.GetMark(i)->GetObj(); - if( pPresObjList->GetPos( pObj ) != LIST_ENTRY_NOTFOUND ) + if( pPresPage->IsPresObj( pObj ) ) { SfxItemSet* pSet = new SfxItemSet( GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 0 ); pSet->Put(pObj->GetMergedItemSet()); @@ -1113,7 +1112,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } } - if( pPresObjList->GetPos( pObj ) != LIST_ENTRY_NOTFOUND ) + if( pPresPage->IsPresObj( pObj ) ) { SfxItemSet* pSet = (SfxItemSet*) pAttrList->GetObject(j++); SdrObjUserCall* pUserCall = (SdrObjUserCall*) pAttrList->GetObject(j++); |