[Libreoffice-commits] core.git: sw/inc sw/source

[Noel Grandin (via logerrit)]

 sw/inc/doc.hxx                       |    2 +-
 sw/source/core/doc/docnum.cxx        |    4 ++--
 sw/source/core/edit/ednumber.cxx     |    2 +-
 sw/source/core/inc/UndoNumbering.hxx |    2 +-
 sw/source/core/undo/unnum.cxx        |    8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2cb162c87051971e2830d2bc80cbf7dd80bd00d6
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Aug 20 14:58:59 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Aug 20 17:05:32 2022 +0200

    SwNodeIndex->SwNode in NumOrNoNum
    
    Change-Id: Id877fd8d2881facef1dc4e97932128443892e10e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138587
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3bea82ab60ae..5f2cf5d2bd12 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1151,7 +1151,7 @@ public:
     bool MoveParagraph(SwPaM&, SwNodeOffset nOffset, bool bIsOutlMv = false);
     bool MoveParagraphImpl(SwPaM&, SwNodeOffset nOffset, bool bIsOutlMv, 
SwRootFrame const*);
 
-    bool NumOrNoNum( const SwNodeIndex& rIdx, bool bDel = false);
+    bool NumOrNoNum( SwNode& rIdx, bool bDel = false);
 
     void StopNumRuleAnimations( const OutputDevice* );
 
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b8a98703a697..7bd6ccdc07dc 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2387,10 +2387,10 @@ bool SwDoc::MoveParagraphImpl(SwPaM& rPam, SwNodeOffset 
const nOffset,
     return true;
 }
 
-bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
+bool SwDoc::NumOrNoNum( SwNode& rIdx, bool bDel )
 {
     bool bResult = false;
-    SwTextNode * pTextNd = rIdx.GetNode().GetTextNode();
+    SwTextNode * pTextNd = rIdx.GetTextNode();
 
     if (pTextNd && pTextNd->GetNumRule() != nullptr &&
         (pTextNd->HasNumber() || pTextNd->HasBullet()))
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index e059de972dc4..9e36f89cc0ff 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -641,7 +641,7 @@ bool SwEditShell::NumOrNoNum(
     {
         StartAllAction();
         SwPosition const pos(sw::GetParaPropsPos(*GetLayout(), 
*GetCursor()->GetPoint()));
-        bRet = GetDoc()->NumOrNoNum(pos.nNode, !bNumOn);
+        bRet = GetDoc()->NumOrNoNum(pos.GetNode(), !bNumOn);
         EndAllAction();
     }
     return bRet;
diff --git a/sw/source/core/inc/UndoNumbering.hxx 
b/sw/source/core/inc/UndoNumbering.hxx
index 3c04ed9c91a6..660c14d2bd73 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -113,7 +113,7 @@ class SwUndoNumOrNoNum final : public SwUndo
     bool mbNewNum, mbOldNum;
 
 public:
-    SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool mbOldNum,
+    SwUndoNumOrNoNum( const SwNode& rIdx, bool mbOldNum,
                       bool mbNewNum );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index dafd89fee788..1251635a3135 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -279,9 +279,9 @@ void SwUndoNumUpDown::RepeatImpl(::sw::RepeatContext & 
rContext)
     rContext.GetDoc().NumUpDown(rContext.GetRepeatPaM(), 1 == m_nOffset);
 }
 
-SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum,
+SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNode& rIdx, bool bOldNum,
                                     bool bNewNum)
-    : SwUndo( SwUndoId::NUMORNONUM, &rIdx.GetNode().GetDoc() ),
+    : SwUndo( SwUndoId::NUMORNONUM, &rIdx.GetDoc() ),
       m_nIndex( rIdx.GetIndex() ), mbNewNum(bNewNum),
       mbOldNum(bOldNum)
 {
@@ -316,11 +316,11 @@ void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & 
rContext)
     SwDoc & rDoc = rContext.GetDoc();
     if (mbOldNum && ! mbNewNum)
     {
-        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode);
+        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->GetNode());
     }
     else if ( ! mbOldNum && mbNewNum )
     {
-        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, true);
+        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->GetNode(), true);
     }
 }