From 5704695ec29265605ece5ed7ed566423960b73d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 6 Jun 2008 11:02:38 +0000 Subject: [PATCH] INTEGRATION: CWS impressodf12 (1.18.6); FILE MERGED 2008/04/25 08:50:20 cl 1.18.6.4: RESYNC: (1.18-1.19); FILE MERGED 2008/04/14 14:36:35 cl 1.18.6.3: #i35937# removed unneeeded code 2008/04/13 19:05:19 cl 1.18.6.2: #i35937# allow paragraph depth of -1 to switch of numbering 2008/04/10 17:07:45 cl 1.18.6.1: #i35937# allow paragraph depth of -1 to switch of numbering --- sd/source/ui/dlg/prltempl.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index a669dfd99e24..c268345132f8 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prltempl.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -129,11 +129,11 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, aInputSet.Put( *pItem ); } +/* #i35937# // Jetzt noch das mapping von 10er auf 9er und des lrspace. if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE) ) { SdBulletMapper::PreMapNumBulletForDialog( aInputSet ); - SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET); SvxNumRule* pRule = pBulletItem->GetNumRule(); if(pRule) @@ -150,6 +150,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, aInputSet.Put(aLRItem); } } +*/ // gewaehlte Ebene im Dialog vorselektieren aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pSvxNumBulletItem )) SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet ); +/* #i35937# // Wenn das lrspace geaendert wurde muss die Aenderung in das // Bullet Item gemapt werden... if( SFX_ITEM_SET == pOutSet->GetItemState( EE_PARA_LRSPACE, FALSE ) ) @@ -415,6 +417,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const } SdBulletMapper::PostMapNumBulletForDialog( *pOutSet ); +*/ return pOutSet; }