From 6933825189b311c945d5b6cd7ac39fb081b505e1 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 13 Jun 2008 10:18:35 +0000 Subject: INTEGRATION: CWS swlists01 (1.15.192); FILE MERGED 2008/05/29 09:50:04 od 1.15.192.6: #i86732# method - avoid crash on execution of FN_NUM_BULLET_UP as it already done for FN_NUM_BULLET_DOWN 2008/05/14 12:59:10 od 1.15.192.5: #i86732# remove no longer needed code 2008/05/08 16:20:40 od 1.15.192.4: RESYNC: (1.16-1.17); FILE MERGED 2008/04/16 08:20:34 od 1.15.192.3: #i86732# further changes/adjustments for new list handling 2008/03/20 14:19:48 od 1.15.192.2: RESYNC: (1.15-1.16); FILE MERGED 2008/03/06 08:48:10 od 1.15.192.1: #i86732# refactoring due to revised interface --- sw/source/ui/shells/listsh.cxx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'sw/source/ui/shells') diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 19e2921091c6..c1c8435bd12f 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: listsh.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -164,11 +164,14 @@ void SwListShell::Execute(SfxRequest &rReq) switch (nSlot) { case FN_NUM_BULLET_DOWN: + case FN_NUM_BULLET_UP: { SfxViewFrame * pFrame = GetView().GetViewFrame(); rReq.Done(); - rSh.NumUpDown(); + rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN ) + ? TRUE + : FALSE ); pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! } break; @@ -230,12 +233,6 @@ void SwListShell::Execute(SfxRequest &rReq) rReq.Done(); break; - case FN_NUM_BULLET_UP: - rSh.NumUpDown(FALSE); - GetView().GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! - rReq.Done(); - break; - case FN_NUM_OR_NONUM: { BOOL bApi = rReq.IsAPI(); @@ -258,10 +255,8 @@ void SwListShell::GetState(SfxItemSet &rSet) { SfxWhichIter aIter( rSet ); USHORT nWhich = aIter.FirstWhich(); - BOOL bHasChildren; SwWrtShell& rSh = GetShell(); - BYTE nCurrentNumLevel = rSh.GetNumLevel( &bHasChildren ); - nCurrentNumLevel = GetRealLevel(nCurrentNumLevel); + BYTE nCurrentNumLevel = rSh.GetNumLevel(); while ( nWhich ) { switch( nWhich ) -- cgit