Get rid of a pointless indirect function pointer variable

Change-Id: I542a5fb00a5c972230c072d72a745fddb095f708

18 files changed, 59 insertions, 70 deletions

diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index d456feca753b..5615d341780f 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -31,7 +31,7 @@ class SwLayoutFrame;
 struct SwMoveFnCollection;
 
 // Type definition for CursorShell.
-// Direction-parameter for MovePage (initialized in SwContentFrame).
+// Direction-parameter for MovePage.
 typedef SwLayoutFrame * (*SwWhichPage)( const SwLayoutFrame * );
 SwLayoutFrame *GetPrevFrame( const SwLayoutFrame *pFrame );
 SwLayoutFrame *GetThisFrame( const SwLayoutFrame *pFrame );
@@ -40,9 +40,11 @@ typedef SwContentFrame  * (*SwPosPage)( const SwLayoutFrame * );
 SwContentFrame *GetFirstSub( const SwLayoutFrame *pLayout );
 SwContentFrame *GetLastSub( const SwLayoutFrame *pLayout );
 
-// Direction-parameter for MovePara (initialized in SwContentFrame).
+// Direction-parameter for MovePara.
 typedef bool (*SwWhichPara)( SwPaM&, SwMoveFnCollection const & );
-extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
+bool GoPrevPara( SwPaM&, SwMoveFnCollection const &);
+SW_DLLPUBLIC bool GoCurrPara( SwPaM&, SwMoveFnCollection const &);
+bool GoNextPara( SwPaM&, SwMoveFnCollection const &);
 extern SwMoveFnCollection const & fnParaStart;
 extern SwMoveFnCollection const & fnParaEnd;
 
@@ -101,7 +103,6 @@ enum class SwDocPositions
     OtherEnd
 };
 
-SW_DLLPUBLIC SwWhichPara GetfnParaCurr();
 SW_DLLPUBLIC SwMoveFnCollection const & GetfnParaStart();
 SW_DLLPUBLIC SwMoveFnCollection const & GetfnParaEnd();
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3ef3363e5ff1..e1b9a6571c0c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -399,7 +399,7 @@ void SwUiWriterTest::testBookmarkCopy()
     rIDCO.SplitNode(*aPaM.GetPoint(), false);
     rIDCO.InsertString(aPaM, "bar");
     aPaM.SetMark();
-    aPaM.MovePara(GetfnParaCurr(), GetfnParaStart());
+    aPaM.MovePara(GoCurrPara, GetfnParaStart());
     rIDMA.makeMark(aPaM, "Mark", IDocumentMarkAccess::MarkType::BOOKMARK);
     aPaM.Exchange();
     aPaM.DeleteMark();
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 47879a97672f..a296b9b4102b 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -44,9 +44,6 @@ static SwMoveFnCollection aBwrd = {
     /* fnSection    */  &SwNodes::GoEndOfSection
 };
 
-SwWhichPara fnParaPrev  = &GoPrevPara;
-SwWhichPara fnParaCurr  = &GoCurrPara;
-SwWhichPara fnParaNext  = &GoNextPara;
 SwMoveFnCollection const & fnParaStart   = aFwrd;
 SwMoveFnCollection const & fnParaEnd     = aBwrd;
 
@@ -69,10 +66,6 @@ SwMoveFnCollection const & fnRegionEnd = aBwrd;
 SwMoveFnCollection const & fnMoveBackward = aBwrd;
 SwMoveFnCollection const & fnMoveForward  = aFwrd;
 
-SwWhichPara GetfnParaCurr()
-{
-    return fnParaCurr;
-}
 SwMoveFnCollection const & GetfnParaStart()
 {
      return  fnParaStart;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 484b0be0a000..1eb2c3ea48a7 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2037,10 +2037,10 @@ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwMoveFnCollection const & fnPo
     // for optimization test something before
     const SwNode* pNd = &GetPoint()->nNode.GetNode();
     bool bShortCut = false;
-    if ( fnWhichPara == fnParaCurr )
+    if ( fnWhichPara == GoCurrPara )
     {
         // #i41048#
-        // If fnWhichPara == fnParaCurr then (*fnWhichPara)( *this, fnPosPara )
+        // If fnWhichPara == GoCurrPara then (*fnWhichPara)( *this, fnPosPara )
         // can already move the cursor to a different text node. In this case
         // we better check if IsSelOvr().
         const SwContentNode* pContentNd = pNd->GetContentNode();
@@ -2055,7 +2055,7 @@ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwMoveFnCollection const & fnPo
     {
         if ( pNd->IsTextNode() &&
              pNd->GetNodes()[ pNd->GetIndex() +
-                    (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTextNode() )
+                    (fnWhichPara == GoNextPara ? 1 : -1 ) ]->IsTextNode() )
             bShortCut = true;
     }
 
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 3e02c997ccb3..9b5bd95c5b92 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -42,11 +42,6 @@ bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
 SW_DLLPUBLIC SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool );
 SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
 
-// Funktionsdefinitionen fuer die SwCursorShell
-bool GoPrevPara( SwPaM&, SwMoveFnCollection const &);
-bool GoCurrPara( SwPaM&, SwMoveFnCollection const &);
-bool GoNextPara( SwPaM&, SwMoveFnCollection const &);
-
 // Typedefiniton fuer Funktionen
 typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
 typedef SwContentNode* (*GoNds)( SwNodeIndex*, bool );
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 76f3bc996e9a..1a17693d3dcc 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1249,7 +1249,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
         // try to go to the start of the next paragraph
         if (!bTmp)
         {
-            rUnoCursor.MovePara(fnParaNext, fnParaStart);
+            rUnoCursor.MovePara(GoNextPara, fnParaStart);
         }
     }
 
@@ -1436,7 +1436,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s
     bool bRet = rUnoCursor.GoSentence(SwCursor::NEXT_SENT);
     if (!bRet)
     {
-        bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart);
+        bRet = rUnoCursor.MovePara(GoNextPara, fnParaStart);
     }
 
     // if at the end of the sentence (i.e. at the space after the '.')
@@ -1471,10 +1471,10 @@ throw (uno::RuntimeException, std::exception)
     bool bRet = rUnoCursor.GoSentence(SwCursor::PREV_SENT);
     if (!bRet)
     {
-        bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart);
+        bRet = rUnoCursor.MovePara(GoPrevPara, fnParaStart);
         if (bRet)
         {
-            rUnoCursor.MovePara(fnParaCurr, fnParaEnd);
+            rUnoCursor.MovePara(GoCurrPara, fnParaEnd);
             // at the end of a paragraph move to the sentence end again
             rUnoCursor.GoSentence(SwCursor::PREV_SENT);
         }
@@ -1526,7 +1526,7 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException,
     bool bAlreadyParaEnd = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
     bool bRet = !bAlreadyParaEnd
             &&  (rUnoCursor.GoSentence(SwCursor::END_SENT)
-                 || rUnoCursor.MovePara(fnParaCurr, fnParaEnd));
+                 || rUnoCursor.MovePara(GoCurrPara, fnParaEnd));
     if (CURSOR_META == m_pImpl->m_eType)
     {
         bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText,
@@ -1574,10 +1574,10 @@ throw (uno::RuntimeException, std::exception)
     bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
     if (!bRet)
     {
-        bRet = rUnoCursor.MovePara(fnParaCurr, fnParaStart);
+        bRet = rUnoCursor.MovePara(GoCurrPara, fnParaStart);
     }
 
-    // since MovePara(fnParaCurr, fnParaStart) only returns false
+    // since MovePara(GoCurrPara, fnParaStart) only returns false
     // if we were already at the start of the paragraph this function
     // should always complete successfully.
     OSL_ENSURE( bRet, "gotoStartOfParagraph failed" );
@@ -1599,10 +1599,10 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException,
     bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
     if (!bRet)
     {
-        bRet = rUnoCursor.MovePara(fnParaCurr, fnParaEnd);
+        bRet = rUnoCursor.MovePara(GoCurrPara, fnParaEnd);
     }
 
-    // since MovePara(fnParaCurr, fnParaEnd) only returns false
+    // since MovePara(GoCurrPara, fnParaEnd) only returns false
     // if we were already at the end of the paragraph this function
     // should always complete successfully.
     OSL_ENSURE( bRet, "gotoEndOfParagraph failed" );
@@ -1621,7 +1621,7 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException,
         return false;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    const bool bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart);
+    const bool bRet = rUnoCursor.MovePara(GoNextPara, fnParaStart);
     return bRet;
 }
 
@@ -1638,7 +1638,7 @@ throw (uno::RuntimeException, std::exception)
         return false;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    const bool bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart);
+    const bool bRet = rUnoCursor.MovePara(GoPrevPara, fnParaStart);
     return bRet;
 }
 
@@ -2002,14 +2002,14 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
     auto pTemp ( rDoc.CreateUnoCursor(aStart) );
     if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
     {
-        pTemp->MovePara(fnParaCurr, fnParaStart);
+        pTemp->MovePara(GoCurrPara, fnParaStart);
     }
     pTemp->SetMark();
     *pTemp->GetPoint() = aEnd;
     SwUnoCursorHelper::SelectPam(*pTemp, true);
     if(!SwUnoCursorHelper::IsEndOfPara(*pTemp))
     {
-        pTemp->MovePara(fnParaCurr, fnParaEnd);
+        pTemp->MovePara(GoCurrPara, fnParaEnd);
     }
     rDoc.ResetAttrs(*pTemp, true, rWhichIds);
 }
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index f05434a718d8..61f3f9951a6e 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -593,7 +593,7 @@ SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementE
         }
         else
         {
-            aNewCursor->MovePara(fnParaNext, fnParaStart);
+            aNewCursor->MovePara(GoNextPara, fnParaStart);
         }
         if (m_nEndIndex < aNewCursor->Start()->nNode.GetIndex())
         {
@@ -625,7 +625,7 @@ SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementE
     // before AND after the movement...
     if (lcl_CursorIsInSection( &rUnoCursor, m_pOwnStartNode ) &&
         (m_bFirstParagraph || bInTable ||
-        (rUnoCursor.MovePara(fnParaNext, fnParaStart) &&
+        (rUnoCursor.MovePara(GoNextPara, fnParaStart) &&
             lcl_CursorIsInSection( &rUnoCursor, m_pOwnStartNode ))))
     {
         SwPosition* pStart = rUnoCursor.Start();
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 301f60a2c4c3..5715ac07e2bb 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -75,13 +75,13 @@ SwParaSelection::SwParaSelection(SwCursor & rCursor)
     // is it at the start?
     if (m_rCursor.GetPoint()->nContent != 0)
     {
-        m_rCursor.MovePara(fnParaCurr, fnParaStart);
+        m_rCursor.MovePara(GoCurrPara, fnParaStart);
     }
     // or at the end already?
     if (m_rCursor.GetPoint()->nContent != m_rCursor.GetContentNode()->Len())
     {
         m_rCursor.SetMark();
-        m_rCursor.MovePara(fnParaCurr, fnParaEnd);
+        m_rCursor.MovePara(GoCurrPara, fnParaEnd);
     }
 }
 
@@ -90,7 +90,7 @@ SwParaSelection::~SwParaSelection()
     if (m_rCursor.GetPoint()->nContent != 0)
     {
         m_rCursor.DeleteMark();
-        m_rCursor.MovePara(fnParaCurr, fnParaStart);
+        m_rCursor.MovePara(GoCurrPara, fnParaStart);
     }
 }
 
@@ -1180,7 +1180,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
             auto pTemp( aCursor.GetDoc()->CreateUnoCursor(aStart) );
             if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
             {
-                pTemp->MovePara(fnParaCurr, fnParaStart);
+                pTemp->MovePara(GoCurrPara, fnParaStart);
             }
 
             pTemp->SetMark();
@@ -1190,7 +1190,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
             if (!SwUnoCursorHelper::IsEndOfPara(*pTemp))
             {
-                pTemp->MovePara(fnParaCurr, fnParaEnd);
+                pTemp->MovePara(GoCurrPara, fnParaEnd);
             }
 
 
@@ -1399,11 +1399,11 @@ throw (uno::RuntimeException, std::exception)
         SwPosition aPos( *pTextNode );
         SwCursor aCursor( aPos, nullptr );
         if (!SwUnoCursorHelper::IsStartOfPara(aCursor)) {
-            aCursor.MovePara(fnParaCurr, fnParaStart);
+            aCursor.MovePara(GoCurrPara, fnParaStart);
         }
         SwUnoCursorHelper::SelectPam(aCursor, true);
         if (pTextNode->GetText().getLength()) {
-            aCursor.MovePara(fnParaCurr, fnParaEnd);
+            aCursor.MovePara(GoCurrPara, fnParaEnd);
         }
         SwUnoCursorHelper::SetString(aCursor, aString);
         SwUnoCursorHelper::SelectPam(aCursor, false);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 24d0822ad9a9..354c481dbc73 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1617,9 +1617,9 @@ SwXText::convertToTextFrame(
                 SwCursor aDelete(*aStartPam.GetPoint(), nullptr);
                 *aStartPam.GetPoint() = // park it because node is deleted
                     SwPosition(GetDoc()->GetNodes().GetEndOfContent());
-                aDelete.MovePara(fnParaCurr, fnParaStart);
+                aDelete.MovePara(GoCurrPara, fnParaStart);
                 aDelete.SetMark();
-                aDelete.MovePara(fnParaCurr, fnParaEnd);
+                aDelete.MovePara(GoCurrPara, fnParaEnd);
                 GetDoc()->getIDocumentContentOperations().DelFullPara(aDelete);
             }
             if (bParaAfterInserted)
@@ -1627,9 +1627,9 @@ SwXText::convertToTextFrame(
                 SwCursor aDelete(*pEndPam->GetPoint(), nullptr);
                 *pEndPam->GetPoint() = // park it because node is deleted
                     SwPosition(GetDoc()->GetNodes().GetEndOfContent());
-                aDelete.MovePara(fnParaCurr, fnParaStart);
+                aDelete.MovePara(GoCurrPara, fnParaStart);
                 aDelete.SetMark();
-                aDelete.MovePara(fnParaCurr, fnParaEnd);
+                aDelete.MovePara(GoCurrPara, fnParaEnd);
                 GetDoc()->getIDocumentContentOperations().DelFullPara(aDelete);
             }
             throw lang::IllegalArgumentException();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 36f2fc18873e..84eccfbfb236 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -765,7 +765,7 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() )
                             pCursorSh->GetCursor()->GetPoint()
                                    ->nNode.GetIndex() == nNodeIdx )
                         {
-                            pCursorSh->MovePara(fnParaPrev, fnParaEnd );
+                            pCursorSh->MovePara(GoPrevPara, fnParaEnd );
                             pCursorSh->SetMark();
                             pCursorSh->ClearMark();
                         }
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index c1e84334d932..1ff76ed1c1cd 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -280,7 +280,7 @@ void SwDropCapsPict::UpdatePaintSettings()
             mpPage->rSh.Push();
             mpPage->rSh.SttCursorMove();
             mpPage->rSh.ClearMark();
-            SwWhichPara pSwuifnParaCurr = GetfnParaCurr();
+            SwWhichPara pSwuifnParaCurr = GoCurrPara;
             SwMoveFnCollection const & pSwuifnParaStart = GetfnParaStart();
             mpPage->rSh.MovePara(pSwuifnParaCurr,pSwuifnParaStart);
             // normal
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 1aa7803b6ad1..279f96354025 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1368,13 +1368,13 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                             // at the end.
 
                             rSh.SwCursorShell::MovePara(
-                                    GetfnParaCurr(), GetfnParaStart() );
+                                    GoCurrPara, GetfnParaStart() );
                             pMark = rSh.SetBookmark(
                                     vcl::KeyCode(),
                                     OUString(),
                                     OUString(), IDocumentMarkAccess::MarkType::UNO_BOOKMARK );
                             rSh.SwCursorShell::MovePara(
-                                    GetfnParaCurr(), GetfnParaEnd() );
+                                    GoCurrPara, GetfnParaEnd() );
                             bSetCursor = false;
                         }
                     }
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 9745e49e2270..6f9a4f4b7745 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -449,7 +449,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
     else
     {
         //we may end up inside of a paragraph if the left margin is not at DEFAULT_LEFT_DISTANCE
-        rShell.MovePara(GetfnParaCurr(), GetfnParaStart());
+        rShell.MovePara(GoCurrPara, GetfnParaStart());
     }
     bool bSplitNode = !rShell.GetText().isEmpty();
     sal_Int32 nMoves = rConfigItem.GetGreetingMoves();
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index a8a7f8f976cc..a879fac088d7 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -587,12 +587,12 @@ namespace SwLangHelper
     {
         // select current para
         if (!rWrtSh.IsSttPara())
-            rWrtSh.MovePara( fnParaCurr, fnParaStart );
+            rWrtSh.MovePara( GoCurrPara, fnParaStart );
         if (!rWrtSh.HasMark())
             rWrtSh.SetMark();
         rWrtSh.SwapPam();
         if (!rWrtSh.IsEndPara())
-            rWrtSh.MovePara( fnParaCurr, fnParaEnd );
+            rWrtSh.MovePara( GoCurrPara, fnParaEnd );
     #if OSL_DEBUG_LEVEL > 1
         OUString aSelText;
         rWrtSh.GetSelectedText( aSelText );
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 8ce3d4222ff2..17362738422b 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -394,7 +394,7 @@ void SwWrtShell::DelToEndOfPara()
     ResetCursorStack();
     Push();
     SetMark();
-    if( !MovePara(fnParaCurr,fnParaEnd))
+    if( !MovePara(GoCurrPara,fnParaEnd))
     {
         Pop(false);
         return;
@@ -411,7 +411,7 @@ void SwWrtShell::DelToStartOfPara()
     ResetCursorStack();
     Push();
     SetMark();
-    if( !MovePara(fnParaCurr,fnParaStart))
+    if( !MovePara(GoCurrPara,fnParaStart))
     {
         Pop(false);
         return;
@@ -452,7 +452,7 @@ long SwWrtShell::DelToEndOfSentence()
             SetMark();
             if (!IsEndPara()) // can only be at the end if it's empty
             {   // for an empty paragraph this would actually select the _next_
-                SwCursorShell::MovePara(fnParaCurr, fnParaEnd);
+                SwCursorShell::MovePara(GoCurrPara, fnParaEnd);
             }
             if (!IsEndOfDoc()) // do not delete last paragraph in body text
             {
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 8ffe3c8157a8..f859747361aa 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -341,13 +341,13 @@ bool SwWrtShell::EndPg( bool bSelect )
 bool SwWrtShell::SttPara( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    return MovePara( fnParaCurr, fnParaStart );
+    return MovePara( GoCurrPara, fnParaStart );
 }
 
 void SwWrtShell::EndPara( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    MovePara(fnParaCurr,fnParaEnd);
+    MovePara(GoCurrPara,fnParaEnd);
 }
 
 // Column-by-jumping.
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 4998aa9eb91f..c92f5287ac27 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -108,9 +108,9 @@ void SwWrtShell::SelPara(const Point *pPt )
     {
         SwMvContext aMvContext(this);
         ClearMark();
-        SwCursorShell::MovePara( fnParaCurr, fnParaStart );
+        SwCursorShell::MovePara( GoCurrPara, fnParaStart );
         SttSelect();
-        SwCursorShell::MovePara( fnParaCurr, fnParaEnd );
+        SwCursorShell::MovePara( GoCurrPara, fnParaEnd );
     }
     EndSelect();
     if(pPt)
diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx b/sw/source/uibase/wrtsh/wrtsh4.cxx
index 4b4d4783d53a..e610aae29c22 100644
--- a/sw/source/uibase/wrtsh/wrtsh4.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh4.cxx
@@ -36,7 +36,7 @@ bool SwWrtShell::SttWrd()
     ClearMark();
     if( !GoStartWord() )
             // not found --> go to the beginning of the paragraph.
-        SwCursorShell::MovePara( fnParaCurr, fnParaStart );
+        SwCursorShell::MovePara( GoCurrPara, fnParaStart );
     ClearMark();
         // If Mark was previously set, summarize.
     Combine();
@@ -57,7 +57,7 @@ bool SwWrtShell::EndWrd()
     ClearMark();
     if( !GoEndWord() )
             // not found --> go to the end of the paragraph.
-        SwCursorShell::MovePara(fnParaCurr, fnParaEnd);
+        SwCursorShell::MovePara(GoCurrPara, fnParaEnd);
     ClearMark();
         // If Mark was previously set, summarize.
     Combine();
@@ -82,7 +82,7 @@ bool SwWrtShell::NxtWrd_()
     {
         if( !GoNextWord() )
         {
-            if( (!IsEndPara() && !SwCursorShell::MovePara( fnParaCurr, fnParaEnd ) )
+            if( (!IsEndPara() && !SwCursorShell::MovePara( GoCurrPara, fnParaEnd ) )
                 || !SwCursorShell::Right(1,CRSR_SKIP_CHARS) )
                 break;
             bRet = IsStartWord();
@@ -113,7 +113,7 @@ bool SwWrtShell::PrvWrd_()
     {
         if( !GoPrevWord() )
         {
-            if( (!IsSttPara() && !SwCursorShell::MovePara( fnParaCurr, fnParaStart ) )
+            if( (!IsSttPara() && !SwCursorShell::MovePara( GoCurrPara, fnParaStart ) )
                 || !SwCursorShell::Left(1,CRSR_SKIP_CHARS) )
                 break;
             bRet = IsStartWord();
@@ -143,7 +143,7 @@ bool SwWrtShell::NxtWrdForDelete()
     ClearMark();
     if ( !GoNextWord() )
     {
-        SwCursorShell::MovePara( fnParaCurr, fnParaEnd );
+        SwCursorShell::MovePara( GoCurrPara, fnParaEnd );
     }
     ClearMark();
     Combine();
@@ -166,7 +166,7 @@ bool SwWrtShell::PrvWrdForDelete()
     ClearMark();
     if( !GoPrevWord() )
     {
-        SwCursorShell::MovePara( fnParaCurr, fnParaStart );
+        SwCursorShell::MovePara( GoCurrPara, fnParaStart );
     }
     ClearMark();
     Combine();
@@ -183,7 +183,7 @@ bool SwWrtShell::FwdSentence_()
         return false;
     }
     if( !GoNextSentence() && !IsEndPara() )
-        SwCursorShell::MovePara(fnParaCurr, fnParaEnd);
+        SwCursorShell::MovePara(GoCurrPara, fnParaEnd);
 
     ClearMark();
     Combine();
@@ -201,7 +201,7 @@ bool SwWrtShell::BwdSentence_()
     }
     if( !GoStartSentence()  && !IsSttPara() )
             // not found --> go to the beginning of the paragraph
-        SwCursorShell::MovePara( fnParaCurr, fnParaStart );
+        SwCursorShell::MovePara( GoCurrPara, fnParaStart );
     ClearMark();
     Combine();
     return true;
@@ -211,7 +211,7 @@ bool SwWrtShell::FwdPara_()
 {
     Push();
     ClearMark();
-    bool bRet = SwCursorShell::MovePara(fnParaNext, fnParaStart);
+    bool bRet = SwCursorShell::MovePara(GoNextPara, fnParaStart);
 
     ClearMark();
     Combine();
@@ -223,7 +223,7 @@ bool SwWrtShell::BwdPara_()
     Push();
     ClearMark();
 
-    bool bRet = SwCursorShell::MovePara(fnParaPrev, fnParaStart);
+    bool bRet = SwCursorShell::MovePara(GoPrevPara, fnParaStart);
     if ( !bRet && !IsSttOfPara() )
     {
         SttPara();