Get rid of a pointless indirect function pointer variable
Change-Id: If6847f55e6a09970375998b6eee82ddefaf3eaed
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 1dbe447..dfa8c0d 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -33,9 +33,12 @@ typedef SwMoveFnCollection* SwMoveFn;
// Type definition for CursorShell.
// Direction-parameter for MovePage (initialized in SwContentFrame).
typedef SwLayoutFrame * (*SwWhichPage)( const SwLayoutFrame * );
SwLayoutFrame *GetPrevFrame( const SwLayoutFrame *pFrame );
SwLayoutFrame *GetThisFrame( const SwLayoutFrame *pFrame );
SwLayoutFrame *GetNextFrame( const SwLayoutFrame *pFrame );
typedef SwContentFrame * (*SwPosPage)( const SwLayoutFrame * );
extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext;
extern SwPosPage fnPageStart, fnPageEnd;
SwContentFrame *GetFirstSub( const SwLayoutFrame *pLayout );
SwContentFrame *GetLastSub( const SwLayoutFrame *pLayout );
// Direction-parameter for MovePara (initialized in SwContentFrame).
typedef SwMoveFnCollection* SwPosPara;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index ce0d1a4..e24bfc3 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 eadbdd2..46f3e8e 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 f71b3ec..8ffe3c8 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 )
