Get rid of pointless indirect function pointer variables

Change-Id: Ic8eddec51d59b531ae22421b796a148267b9f3c1

10 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 907ea407ffc9..3399572a9184 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -174,7 +174,7 @@ sal_uLong SwASCWriter::WriteStream()
                 bTstFly = false;        // Testing once is enough
             }
 
-            if( !pCurPam->Move( fnMoveForward, fnGoNode ) )
+            if( !pCurPam->Move( fnMoveForward, GoInNode ) )
                 break;
 
             if( bShowProgress )
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 0487085b4cba..001151de98d2 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -799,9 +799,9 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
             else
             {
                 pPam = new SwPaM( *pPam, pPam );
-                pPam->Move( fnMoveBackward, fnGoDoc );
+                pPam->Move( fnMoveBackward, GoInDoc );
                 pPam->SetMark();
-                pPam->Move( fnMoveForward, fnGoDoc );
+                pPam->Move( fnMoveForward, GoInDoc );
             }
         }
         // pPam is still the current Cursor !!
@@ -813,14 +813,14 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
         pPam = new SwPaM( pOutDoc->GetNodes().GetEndOfContent() );
         if( pOutDoc->IsClipBoard() )
         {
-            pPam->Move( fnMoveBackward, fnGoDoc );
+            pPam->Move( fnMoveBackward, GoInDoc );
             pPam->SetMark();
-            pPam->Move( fnMoveForward, fnGoDoc );
+            pPam->Move( fnMoveForward, GoInDoc );
         }
         else
         {
             pPam->SetMark();
-            pPam->Move( fnMoveBackward, fnGoDoc );
+            pPam->Move( fnMoveBackward, GoInDoc );
         }
     }
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 2d6d590508dc..938a77fee396 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1411,7 +1411,7 @@ void SwHTMLParser::StripTrailingPara()
             m_pPam->SetMark();
             m_pPam->DeleteMark();
             m_pDoc->GetNodes().Delete( m_pPam->GetPoint()->nNode );
-            m_pPam->Move( fnMoveBackward, fnGoNode );
+            m_pPam->Move( fnMoveBackward, GoInNode );
         }
         else if( pCNd && pCNd->IsTextNode() && m_pTable )
         {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0be738dedaf9..36f2fc18873e 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -798,7 +798,7 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() )
         else if( !IsNewDoc() )
         {
             if( pPos->nContent.GetIndex() )     // dann gabs am Ende kein <P>,
-                m_pPam->Move( fnMoveForward, fnGoNode );  // als zum naechsten Node
+                m_pPam->Move( fnMoveForward, GoInNode );  // als zum naechsten Node
             SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
             SwNodeIndex aPrvIdx( pPos->nNode );
             if( pTextNode && pTextNode->CanJoinPrev( &aPrvIdx ) &&
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 64a5edd0a9b1..6072cc57d724 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -62,7 +62,7 @@ bool DocxExportFilter::exportDocument()
     // get the correct SwPaM* then...
     SwPaM aPam( pDoc->GetNodes().GetEndOfContent() );
     aPam.SetMark();
-    aPam.Move( fnMoveBackward, fnGoDoc );
+    aPam.Move( fnMoveBackward, GoInDoc );
 
     SwPaM *pCurPam = new SwPaM( *aPam.End(), *aPam.Start() );
 
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 26236dec21e8..34bdd46ed466 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -70,7 +70,7 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD
     // we get SwPaM for the entire document; copy&paste is handled internally, not via UNO
     SwPaM aPam(pDoc->GetNodes().GetEndOfContent());
     aPam.SetMark();
-    aPam.Move(fnMoveBackward, fnGoDoc);
+    aPam.Move(fnMoveBackward, GoInDoc);
 
     auto pCurPam = o3tl::make_unique<SwPaM>(*aPam.End(), *aPam.Start());
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6312f985ff33..e88d7cfa09d2 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1070,7 +1070,7 @@ void SwWW8ImplReader::StopAnlToRestart(sal_uInt8 nNewType, bool bGoBack)
     if (bGoBack)
     {
         SwPosition aTmpPos(*m_pPaM->GetPoint());
-        m_pPaM->Move(fnMoveBackward, fnGoContent);
+        m_pPaM->Move(fnMoveBackward, GoInContent);
         m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_NUMRULE);
         *m_pPaM->GetPoint() = aTmpPos;
     }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9a707b88e0ed..a73c1a18e04b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -806,7 +806,7 @@ void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
     {
         bool insert = true;
         SwPaM pam( *mrReader.m_pLastAnchorPos );
-        if( pam.Move(fnMoveBackward, fnGoNode))
+        if( pam.Move(fnMoveBackward, GoInNode))
             if( SwTextNode* txtNode = pam.GetPoint()->nNode.GetNode().GetTextNode())
                 if( txtNode->Len() == 0 )
                     insert = false;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 15da4400bd80..99b46aba24fe 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -479,7 +479,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
         SwPosition aPos(*pRedlineNode);
         SwXTextCursor *const pXCursor =
             new SwXTextCursor(*pDoc, pXText, CURSOR_REDLINE, aPos);
-        pXCursor->GetCursor().Move(fnMoveForward, fnGoNode);
+        pXCursor->GetCursor().Move(fnMoveForward, GoInNode);
         // cast to avoid ambiguity
         xReturn = static_cast<text::XWordCursor*>(pXCursor);
     }
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 8343a1c4aa60..d7d066d9d71a 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -110,7 +110,7 @@ static void lcl_EnsureValidPam( SwPaM& rPam )
         rPam.GetPoint()->nNode =
             *rPam.GetDoc()->GetNodes().GetEndOfContent().StartOfSectionNode();
         ++ rPam.GetPoint()->nNode;
-        rPam.Move( fnMoveForward, fnGoContent ); // go into content
+        rPam.Move( fnMoveForward, GoInContent ); // go into content
     }
 }