#i26344#

5 files changed, 20 insertions, 21 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f77d756bd1cf..ff1be3ecc922 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: doc.hxx,v $
  *
- *  $Revision: 1.57 $
+ *  $Revision: 1.58 $
  *
- *  last change: $Author: hr $ $Date: 2004-03-08 13:25:29 $
+ *  last change: $Author: hbrinkm $ $Date: 2004-03-11 14:04:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -421,7 +421,6 @@ class SwDoc
                                     // verwaltet!
     sal_uInt16  nLinkUpdMode;       // UpdateMode fuer Links
     sal_uInt16  nFldUpdMode;        // Mode fuer Felder/Charts automatisch aktualisieren
-
     SwRedlineMode eRedlineMode;     // aktueller Redline Modus
     SwCharCompressType eChrCmprType;    // for ASIAN: compress punctuation/kana
 
@@ -1493,9 +1492,9 @@ public:
     void UpdateNumRule( const String& rName, sal_uInt32 nUpdPos );
     void UpdateNumRule();   // alle invaliden Updaten
     /* -> #111955# */
-    void UpdateNumRule( const SwNumRule & rRule, ULONG nUpdatePos,
+    void UpdateNumRule( SwNumRule & rRule, ULONG nUpdatePos,
                         BOOL bOutline = FALSE);
-    void UpdateNumRuleOld( const SwNumRule & rRule, ULONG nUpdatePos);
+    void UpdateNumRuleOld( SwNumRule & rRule, ULONG nUpdatePos);
     /* <- #111955# */
     void ChgNumRuleFmts( const SwNumRule& rRule );
     sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 6de2532647fe..6bb07b83f5a4 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ndtxt.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: hr $ $Date: 2004-03-08 12:23:00 $
+ *  last change: $Author: hbrinkm $ $Date: 2004-03-11 14:04:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -297,7 +297,7 @@ public:
 
     // Numerierung
     const SwNodeNum* UpdateNum( const SwNodeNum& );
-    const SwNumRule *GetNumRule() const;
+    SwNumRule *GetNumRule() const;
     // #111955#
     const SwNodeNum* GetNum(BOOL bOutline = FALSE) const
     { return bOutline ? pNdOutl : pNdNum; }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 37b638584234..6e9e5ad418c4 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docnum.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: hr $ $Date: 2004-03-08 12:24:21 $
+ *  last change: $Author: hbrinkm $ $Date: 2004-03-11 14:04:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2232,7 +2232,7 @@ void SwDoc::UpdateNumRule( const String& rName, ULONG nUpdatePos )
    @param bOutline        TRUE:   update outline numbering
                           FALSE:  update normal numbering
  */
-void SwDoc::UpdateNumRule( const SwNumRule & rRule, ULONG nUpdatePos,
+void SwDoc::UpdateNumRule( SwNumRule & rRule, ULONG nUpdatePos,
                            BOOL bOutline)
 {
     /* If old numbering is activated use the old algorithm. */
@@ -2290,7 +2290,7 @@ void SwDoc::UpdateNumRule( const SwNumRule & rRule, ULONG nUpdatePos,
         for (int i = 0; i < MAXLEVEL; i++)
             bInitializedLevels[i] = true;
 
-        aNum = aNumRuleInfo.GetList().GetObject(nUpdatePos)->
+        aNum = *aNumRuleInfo.GetList().GetObject(nUpdatePos)->
             GetNum(bOutline);
 
         nCount = aNum.GetLevelVal()[aNum.GetRealLevel()];
@@ -2298,7 +2298,7 @@ void SwDoc::UpdateNumRule( const SwNumRule & rRule, ULONG nUpdatePos,
     }
 
     /* The old level is the level of the first node to process. */
-    SwNodeNum * pNum = aNumRuleInfo.GetList().GetObject(nUpdatePos)->
+    const SwNodeNum * pNum = aNumRuleInfo.GetList().GetObject(nUpdatePos)->
         GetNum();
     BYTE nOldLevel = pNum ? pNum->GetLevel() : 0;
 
@@ -2442,7 +2442,7 @@ void SwDoc::UpdateNumRule( const SwNumRule & rRule, ULONG nUpdatePos,
 }
 
 // pre-SRC680-numbering
-void SwDoc::UpdateNumRuleOld( const SwNumRule & rRule, ULONG nUpdPos )
+void SwDoc::UpdateNumRuleOld( SwNumRule & rRule, ULONG nUpdPos )
 {
     SwNumRuleInfo aUpd( rRule.GetName() );
     aUpd.MakeList( *this );
@@ -2452,7 +2452,7 @@ void SwDoc::UpdateNumRuleOld( const SwNumRule & rRule, ULONG nUpdPos )
     else
         aUpd.GetList().SearchKey( nUpdPos, &nUpdPos );
 
-    const SwNumRule* pRule = &rRule;
+    SwNumRule* pRule = &rRule;
 
     if( nUpdPos < aUpd.GetList().Count() )
     {
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 52d389a21eed..58031842bbfa 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ndtxt.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: hr $ $Date: 2004-03-08 12:26:49 $
+ *  last change: $Author: hbrinkm $ $Date: 2004-03-11 14:04:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2298,7 +2298,7 @@ const SwNodeNum* SwTxtNode::UpdateNum( const SwNodeNum& rNum )
     return pNdNum;
 }
 
-const SwNumRule* SwTxtNode::GetNumRule() const
+SwNumRule* SwTxtNode::GetNumRule() const
 {
     const SwNumRule* pRet = 0;
     const SfxPoolItem* pItem = GetNoCondAttr( RES_PARATR_NUMRULE, TRUE );
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 26b9de3f4dc1..8fd4cde9b443 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlnum.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2004-03-08 12:28:16 $
+ *  last change: $Author: hbrinkm $ $Date: 2004-03-11 14:04:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -351,7 +351,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
     // den aktuellen Absatz erst einmal nicht numerieren
     {
         BYTE nLvl = nLevel;
-        SetNoNum(nLevel, TRUE);
+        SetNoNum(&nLevel, TRUE);
         SetNodeNum( nLvl );
     }