From 0bc22365527ab97ebbffc26ac2e98194abf539b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 6 Jun 2008 11:03:11 +0000 Subject: [PATCH] INTEGRATION: CWS impressodf12 (1.16.288); FILE MERGED 2008/05/26 12:26:30 cl 1.16.288.4: #i35937# code cleanup after bullet rework 2008/04/25 08:52:36 cl 1.16.288.3: RESYNC: (1.16-1.17); FILE MERGED 2008/04/13 19:05:19 cl 1.16.288.2: #i35937# allow paragraph depth of -1 to switch of numbering 2008/04/10 17:07:46 cl 1.16.288.1: #i35937# allow paragraph depth of -1 to switch of numbering --- sd/source/ui/func/fuexpand.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index acf2911ae35b..cc8d582aea91 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fuexpand.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -114,7 +114,6 @@ void FuExpandPage::DoExecute( SfxRequest& ) pOutl->SetDefTab( mpDoc->GetDefaultTabulator() ); pOutl->SetStyleSheetPool((SfxStyleSheetPool*) mpDoc->GetStyleSheetPool()); - pOutl->SetMinDepth(0); SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); USHORT nActualPageNum = pActualPage->GetPageNum(); @@ -145,8 +144,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) while (pPara) { ULONG nParaPos = pOutl->GetAbsPos( pPara ); - USHORT nDepth = pOutl->GetDepth( (USHORT) nParaPos ); - if ( nDepth == 1 ) + sal_Int16 nDepth = pOutl->GetDepth( (USHORT) nParaPos ); + if ( nDepth == 0 ) { // Seite mit Titel & Gliederung! SdPage* pPage = (SdPage*) mpDoc->AllocPage(FALSE); @@ -196,16 +195,15 @@ void FuExpandPage::DoExecute( SfxRequest& ) OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1); pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT); - if( pOutlinerParaObject->GetDepth(0) != 0 ) + if( pOutlinerParaObject->GetDepth(0) != -1 ) { SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_TITLEOBJECT, mpDoc ); pTempOutl->SetText( *pOutlinerParaObject ); - pTempOutl->SetMinDepth(0); delete pOutlinerParaObject; - pTempOutl->SetDepth( pTempOutl->GetParagraph( 0 ), 0 ); + pTempOutl->SetDepth( pTempOutl->GetParagraph( 0 ), -1 ); pOutlinerParaObject = pTempOutl->CreateParaObject(); delete pTempOutl;