#100334# FN_NUMBER_NEWSTART in SwTextShell corrected

4 files changed, 16 insertions, 25 deletions

diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index 7117afb3cb33..5dd67389ea6f 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _listsh.sdi,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-09-28 07:01:35 $
+ *  last change: $Author: os $ $Date: 2002-06-14 11:45:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,13 +64,6 @@ interface BaseTextList : Selection
     Automation = FALSE
 ]
 {
-    FN_NUMBER_NEWSTART // status()
-    [
-        ExecMethod = Execute ;
-        StateMethod = GetState ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
-
     FN_NUM_BULLET_DOWN // status(final|play)
     [
         ExecMethod = Execute ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index a4f160935b40..e731f63c37f1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _textsh.sdi,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mba $ $Date: 2002-06-14 07:53:23 $
+ *  last change: $Author: os $ $Date: 2002-06-14 11:44:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,7 @@ interface BaseText : Selection
     FN_NUMBER_NEWSTART
     [
         ExecMethod = Execute ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 89f0d7f800d8..5ef67c0f41fa 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: listsh.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-07-09 09:02:03 $
+ *  last change: $Author: os $ $Date: 2002-06-14 11:42:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -202,10 +202,6 @@ void SwListShell::Execute(SfxRequest &rReq)
             rSh.NumOrNoNum( bDelete, !bApi );
         }
         break;
-        case FN_NUMBER_NEWSTART:
-            rSh.SetNumRuleStart(!rSh.IsNumRuleStart());
-        break;
-
         default:
             ASSERT(!this, falscher Dispatcher);
             return;
@@ -230,9 +226,6 @@ void SwListShell::GetState(SfxItemSet &rSet)
             case FN_NUM_OR_NONUM:
                 rSet.Put(SfxBoolItem(nWhich, GetShell().IsNoNum(FALSE)));
             break;
-            case FN_NUMBER_NEWSTART:
-                rSet.Put(SfxBoolItem(nWhich, GetShell().IsNumRuleStart()));
-            break;
             case FN_NUM_BULLET_OUTLINE_UP:
             case FN_NUM_BULLET_UP:
                 if(!nCurrentNumLevel)
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 52b2ea8a906d..6ef69d94961b 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textsh1.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: mba $ $Date: 2002-06-14 07:56:41 $
+ *  last change: $Author: os $ $Date: 2002-06-14 11:43:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -621,7 +621,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case FN_NUMBER_NEWSTART_AT :
         {
             USHORT nWhich = GetPool().GetWhich( nSlot );
-            if ( pArgs->GetItemState( nWhich ) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState( nWhich ) == SFX_ITEM_SET )
                 bUseDialog = FALSE;
             // intentionally no break
 
@@ -756,8 +756,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
                                 nNumStart = USHRT_MAX;
                             rWrtSh.SetNodeNumStart(nNumStart);
                         }
-                        else if (!bStart)
-                            rWrtSh.SetNodeNumStart(USHRT_MAX);
+                        else
+                            rWrtSh.SetNodeNumStart(bStart ? 1 : USHRT_MAX);
                     }
                     else if( SFX_ITEM_SET == pSet->GetItemState(FN_NUMBER_NEWSTART_AT) )
                     {
@@ -939,6 +939,10 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 rSet.DisableItem(nWhich);
             break;
 
+        case FN_NUMBER_NEWSTART :
+            rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART,
+                                        USHRT_MAX != rSh.IsNodeNumStart()));
+        break;
         case FN_EDIT_FORMULA:
         case FN_INSERT_SYMBOL:
             {