From d562c4e4ead3174a9cc720835ecfbfa16e40e15d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 30 Aug 2016 13:20:34 +0200
Subject: Get rid of a pointless indirect function pointer variable

Change-Id: I542a5fb00a5c972230c072d72a745fddb095f708
---
 sw/source/uibase/wrtsh/delete.cxx |  6 +++---
 sw/source/uibase/wrtsh/move.cxx   |  4 ++--
 sw/source/uibase/wrtsh/select.cxx |  4 ++--
 sw/source/uibase/wrtsh/wrtsh4.cxx | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'sw/source/uibase/wrtsh')

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();
-- 
cgit v1.2.3