Get rid of a pointless indirect function pointer variable

Change-Id: I7c202c6bff8ed405817ea1e7feb4a2c6427825ad

3 files changed, 8 insertions, 10 deletions

diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 2ac0f69c1fd9..baefa82390fc 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -69,7 +69,8 @@ typedef SwContentFrame  * (*SwPosColumn)( const SwLayoutFrame * );
 SwLayoutFrame* GetPrevColumn( const SwLayoutFrame* pLayFrame );
 SwLayoutFrame* GetCurrColumn( const SwLayoutFrame* pLayFrame );
 SwLayoutFrame* GetNextColumn( const SwLayoutFrame* pLayFrame );
-extern SwPosColumn fnColumnStart, fnColumnEnd;
+SwContentFrame* GetColumnStt( const SwLayoutFrame* pColFrame );
+SwContentFrame* GetColumnEnd( const SwLayoutFrame* pColFrame );
 
 // Direction-parameter for MoveRegion (ranges!)
 typedef bool (*SwWhichRegion)( SwPaM&, SwMoveFnCollection const &, bool bInReadOnly );
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index ce7ea3699254..f309ea1ea89c 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -64,9 +64,6 @@ SwContentFrame* GetColumnEnd( const SwLayoutFrame* pColFrame )
     return pRet;
 }
 
-SwPosColumn fnColumnStart = &GetColumnStt;
-SwPosColumn fnColumnEnd = &GetColumnEnd;
-
 bool SwCursorShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
 {
     bool bRet = false;
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 34438bdfb9e5..5e1184eb8182 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -357,37 +357,37 @@ void SwWrtShell::EndPara( bool bSelect )
 void SwWrtShell::StartOfColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn(GetCurrColumn, fnColumnStart);
+    MoveColumn(GetCurrColumn, GetColumnStt);
 }
 
 void SwWrtShell::EndOfColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn(GetCurrColumn, fnColumnEnd);
+    MoveColumn(GetCurrColumn, GetColumnEnd);
 }
 
 void SwWrtShell::StartOfNextColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn( GetNextColumn, fnColumnStart);
+    MoveColumn( GetNextColumn, GetColumnStt);
 }
 
 void SwWrtShell::EndOfNextColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn(GetNextColumn, fnColumnEnd);
+    MoveColumn(GetNextColumn, GetColumnEnd);
 }
 
 void SwWrtShell::StartOfPrevColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn(GetPrevColumn, fnColumnStart);
+    MoveColumn(GetPrevColumn, GetColumnStt);
 }
 
 void SwWrtShell::EndOfPrevColumn()
 {
     ShellMoveCursor aTmp( this, false/*bSelect*/);
-    MoveColumn(GetPrevColumn, fnColumnEnd);
+    MoveColumn(GetPrevColumn, GetColumnEnd);
 }
 
 bool SwWrtShell::PushCursor(SwTwips lOffset, bool bSelect)