From 6532d6b15ff5172097ff2c1eb4a52f03b6535cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 6 Jun 2008 11:02:54 +0000 Subject: [PATCH] INTEGRATION: CWS impressodf12 (1.8.210); FILE MERGED 2008/04/25 08:53:06 cl 1.8.210.3: RESYNC: (1.8-1.9); FILE MERGED 2008/04/13 19:05:19 cl 1.8.210.2: #i35937# allow paragraph depth of -1 to switch of numbering 2008/04/10 17:07:45 cl 1.8.210.1: #i35937# allow paragraph depth of -1 to switch of numbering --- sd/source/ui/func/bulmaper.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 0f94fc084445..5f838b45768f 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bulmaper.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -61,8 +61,11 @@ #include "bulmaper.hxx" + #define GetWhich(nSlot) rSet.GetPool()->GetWhich( nSlot ) +/* #i35937# + void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) { if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, FALSE ) ) @@ -75,7 +78,7 @@ void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) SvxNumRule aNewRule( pRule->GetFeatureFlags(), 9, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); for( USHORT i = 0; i < 9; i++ ) - aNewRule.SetLevel(i, pRule->GetLevel(i+1)); + aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); } @@ -97,13 +100,14 @@ void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) SvxNumRule aNewRule( pRule->GetFeatureFlags(), 10, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); for( USHORT i = 0; i < 9; i++ ) - aNewRule.SetLevel(i+1, pRule->GetLevel(i)); + aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); } } } } +*/ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet ) {