Get rid of a pointless indirect function pointer variable

Change-Id: If6847f55e6a09970375998b6eee82ddefaf3eaed

3 files changed, 8 insertions, 16 deletions

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index ce0d1a457787..e24bfc357246 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1115,7 +1115,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
         Pop(false);
         return false;
     }
-    MovePage( fnPageCurr, fnPageStart );
+    MovePage( GetThisFrame, GetFirstSub );
     SwPaM aCpyPam( *GetCursor()->GetPoint() );
     OUString sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName();
     SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, true );
@@ -1143,7 +1143,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
         EndUndo(UNDO_INSERT);
     }
 
-    MovePage( fnPageCurr, fnPageEnd );
+    MovePage( GetThisFrame, GetLastSub );
     aCpyPam.SetMark();
     *aCpyPam.GetMark() = *GetCursor()->GetPoint();
 
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index eadbdd298c0f..46f3e8e09340 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1070,14 +1070,6 @@ SwLayoutFrame *GetPrevFrame( const SwLayoutFrame *pFrame )
     return pPrev;
 }
 
-//Now we can also initialize de function pointers;
-//they are declared in cshtyp.hxx
-SwPosPage fnPageStart = GetFirstSub;
-SwPosPage fnPageEnd = GetLastSub;
-SwWhichPage fnPagePrev = GetPrevFrame;
-SwWhichPage fnPageCurr = GetThisFrame;
-SwWhichPage fnPageNext = GetNextFrame;
-
 /**
  * Returns the first/last Contentframe (controlled using the parameter fnPosPage)
  * of the current/previous/next page (controlled using the parameter fnWhichPage).
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index f71b3ecd61b2..8ffe3c8157a8 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -305,37 +305,37 @@ bool SwWrtShell::EndDoc( bool bSelect)
 bool SwWrtShell::SttNxtPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    return MovePage( fnPageNext, fnPageStart );
+    return MovePage( GetNextFrame, GetFirstSub );
 }
 
 void SwWrtShell::SttPrvPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    MovePage( fnPagePrev, fnPageStart );
+    MovePage( GetPrevFrame, GetFirstSub );
 }
 
 void SwWrtShell::EndNxtPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    MovePage( fnPageNext, fnPageEnd );
+    MovePage( GetNextFrame, GetLastSub );
 }
 
 bool SwWrtShell::EndPrvPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    return MovePage( fnPagePrev, fnPageEnd );
+    return MovePage( GetPrevFrame, GetLastSub );
 }
 
 bool SwWrtShell::SttPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    return MovePage( fnPageCurr, fnPageStart );
+    return MovePage( GetThisFrame, GetFirstSub );
 }
 
 bool SwWrtShell::EndPg( bool bSelect )
 {
     ShellMoveCursor aTmp( this, bSelect );
-    return MovePage( fnPageCurr, fnPageEnd );
+    return MovePage( GetThisFrame, GetLastSub );
 }
 
 bool SwWrtShell::SttPara( bool bSelect )