6 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 06ab1231ff40..75eaf62ee8e0 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -465,7 +465,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
                 SwDoc* pAutoDoc = aTBlks.GetDoc();
                 SwNodeIndex aSttIdx( pAutoDoc->GetNodes().GetEndOfExtras(), 1 );
-                SwContentNode* pContentNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
+                SwContentNode* pContentNd = SwNodes::GoNext(&aSttIdx);
                 SwPaM aCpyPam( aSttIdx );
 
                 const SwTableNode* pTableNd = pContentNd->FindTableNode();
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index cfc465fce837..7cdd4c228546 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -74,7 +74,7 @@ void SwEditShell::GCAttr()
                 if( pNd->IsTextNode() )
                     static_cast<SwTextNode*>(pNd)->GCAttr();
             }
-            while( nullptr != ( pNd = GetDoc()->GetNodes().GoNext( &aIdx )) &&
+            while( nullptr != ( pNd = SwNodes::GoNext( &aIdx )) &&
                     aIdx <= rEnd );
         }
     }
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index c1137b499471..dc79e9c3c9d0 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -461,7 +461,7 @@ size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes )
             SwNodeIndex aIdx( *pIdx, 1 );
             SwTextNode* pTextNd = aIdx.GetNode().GetTextNode();
             if( !pTextNd )
-                pTextNd = static_cast<SwTextNode*>(mxDoc->GetNodes().GoNext( &aIdx ));
+                pTextNd = static_cast<SwTextNode*>(SwNodes::GoNext(&aIdx));
 
             if( pTextNd )
             {
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 9e71db2fd62d..4f186680d049 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -338,10 +338,9 @@ void SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
     SwPosition& rCursorPos = *pCursor->GetPoint();
     rCursorPos.Assign(rPos.GetDocPos());
 
-    SwDoc* pMyDoc = GetDoc();
     SwContentNode * pCNd = rCursorPos.GetNode().GetContentNode();
     if( !pCNd )
-        pCNd = pMyDoc->GetNodes().GoNext( &rCursorPos );
+        pCNd = SwNodes::GoNext(&rCursorPos);
 
     EndCursorMove();
 }
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 80310bab4f47..ea82906b18d2 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -99,7 +99,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
         SwPaM* pCursor = GetCursor();
 
         SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-        SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+        SwContentNode* pContentNd = SwNodes::GoNext(&aStt);
         const SwNode* pNd = pContentNd->FindTableNode();
         if( !pNd )
             pNd = pContentNd;
@@ -124,7 +124,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
         if( rBlock.BeginPutDoc( rShortName, rName ) )
         {
             SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-            SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+            SwContentNode* pContentNd = SwNodes::GoNext(&aStt);
             const SwNode* pNd = pContentNd->FindTableNode();
             if( !pNd ) pNd = pContentNd;
             SwPaM aCpyPam( *pNd );
@@ -137,7 +137,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
                 aCpyPam.GetPoint()->SetContent( pContentNd->Len() );
 
             aStt = pGDoc->GetNodes().GetEndOfExtras();
-            pContentNd = pGDoc->GetNodes().GoNext( &aStt );
+            pContentNd = SwNodes::GoNext(&aStt);
             SwPosition aInsPos( aStt );
             pMyDoc->getIDocumentContentOperations().CopyRange(aCpyPam, aInsPos, SwCopyFlags::CheckPosInFly);
 
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 0400dc887169..5927681128f2 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -863,7 +863,7 @@ sal_Int32 SwEditShell::GetLineCount()
 
     aStart = SwNodeOffset(0);
 
-    while( nullptr != ( pCNd = GetDoc()->GetNodes().GoNextSection(
+    while (nullptr != (pCNd = SwNodes::GoNextSection(
                 &aStart, true, false )) )
     {
         if( nullptr != ( pContentFrame = pCNd->getLayoutFrame( GetLayout() ) ) && pContentFrame->IsTextFrame() )