diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-07-19 10:16:36 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-07-19 10:16:36 +0000 |
| commit | b48a1bd1c9e81faffa82f0559f2c1b73621aeb30 (patch) | |
| tree | 5ab4969651cf17ba6c671b9d6d6bcff2f9b51362 /sw/source/ui/shells/txtnum.cxx | |
| parent | 8f0b5a31a2ea51bd5ddeb3b717b3bf1b42181619 (diff) | |
#101486#: recording
Diffstat (limited to 'sw/source/ui/shells/txtnum.cxx')
| -rw-r--r-- | sw/source/ui/shells/txtnum.cxx | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 3d9274b54fbd..c5ff914fe3c1 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtnum.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mba $ $Date: 2002-06-14 07:58:09 $ + * last change: $Author: mba $ $Date: 2002-07-19 11:16:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,11 +101,38 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) { case FN_NUM_NUMBERING_ON: { - rReq.Done(); - if(!GetShell().GetCurNumRule()) - GetShell().NumOn(); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + BOOL bMode = !GetShell().GetCurNumRule(); + if ( pItem ) + bMode = pItem->GetValue(); else - GetShell().DelNumRules(); + rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) ); + if ( bMode != (GetShell().GetCurNumRule()!=NULL) ) + { + rReq.Done(); + if( bMode ) + GetShell().NumOn(); + else + GetShell().DelNumRules(); + } + } + break; + case FN_NUM_BULLET_ON: + { + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + BOOL bMode = !GetShell().GetCurNumRule(); + if ( pItem ) + bMode = pItem->GetValue(); + else + rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) ); + if ( bMode != (GetShell().GetCurNumRule()!=NULL) ) + { + rReq.Done(); + if( bMode ) + GetShell().BulletOn(); + else + GetShell().DelNumRules(); + } } break; case FN_NUMBER_BULLETS: @@ -279,15 +306,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) */ } break; - case FN_NUM_BULLET_ON: - { - if ( !GetShell().GetCurNumRule() ) - GetShell().BulletOn(); - else - GetShell().DelNumRules(); - - } - break; default: ASSERT(FALSE, falscher Dispatcher); return; @@ -297,6 +315,9 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.3 2002/06/14 07:58:09 mba + #100118#: recording + Revision 1.2 2001/02/23 12:45:29 os Complete use of DefaultNumbering component |