summaryrefslogtreecommitdiff
path: root/sw/source/core/edit
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-29 12:52:04 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-29 14:45:32 +0300
commit6f9750ef54f7e0f2c1345b39dcf45bdf589630d8 (patch)
treebad8db239238254daa1a6107dccae1245dfea172 /sw/source/core/edit
parentbdd60f1f5e0b995572321fd0865ccb8849d8ed76 (diff)
Get rid of pointless indirect function pointer variables
Change-Id: Ic8eddec51d59b531ae22421b796a148267b9f3c1
Diffstat (limited to 'sw/source/core/edit')
-rw-r--r--sw/source/core/edit/autofmt.cxx4
-rw-r--r--sw/source/core/edit/eddel.cxx4
-rw-r--r--sw/source/core/edit/edglss.cxx2
-rw-r--r--sw/source/core/edit/ednumber.cxx4
-rw-r--r--sw/source/core/edit/edtab.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 1d129cc4a48e..0cf4b47652c9 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2582,7 +2582,7 @@ void SwEditShell::AutoFormatBySplitNode()
{
SET_CURR_SHELL( this );
SwPaM* pCursor = GetCursor();
- if( !pCursor->IsMultiSelection() && pCursor->Move( fnMoveBackward, fnGoNode ) )
+ if( !pCursor->IsMultiSelection() && pCursor->Move( fnMoveBackward, GoInNode ) )
{
StartAllAction();
StartUndo( UNDO_AUTOFORMAT );
@@ -2622,7 +2622,7 @@ void SwEditShell::AutoFormatBySplitNode()
pCursor = GetCursor();
}
pCursor->DeleteMark();
- pCursor->Move( fnMoveForward, fnGoNode );
+ pCursor->Move( fnMoveForward, GoInNode );
EndUndo( UNDO_AUTOFORMAT );
EndAllAction();
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 70b13d35eb98..0ab00d9f6cf4 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -71,7 +71,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
{
// then go to the end of the selection
aDelPam.GetPoint()->nNode = rEndNd;
- aDelPam.Move( fnMoveBackward, fnGoContent );
+ aDelPam.Move( fnMoveBackward, GoInContent );
}
// skip protected boxes
if( !rNd.IsContentNode() ||
@@ -85,7 +85,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
if( !pEndSelPos ) // at the end of a selection
break;
aDelPam.DeleteMark();
- aDelPam.Move( fnMoveForward, fnGoContent ); // next box
+ aDelPam.Move( fnMoveForward, GoInContent ); // next box
} while( pEndSelPos );
}
else
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 6f872ee5e1c6..a192dc1e3f9e 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -212,7 +212,7 @@ bool SwEditShell::CopySelToDoc( SwDoc* pInsDoc )
( bColSel || !pNd->GetTextNode() ) )
{
rPaM.SetMark();
- rPaM.Move( fnMoveForward, fnGoContent );
+ rPaM.Move( fnMoveForward, GoInContent );
bRet = GetDoc()->getIDocumentContentOperations().CopyRange( rPaM, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true )
|| bRet;
rPaM.Exchange();
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 1ca81b2017b9..ab385cd975e9 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -506,13 +506,13 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
if( nOffset )
{
- aCursor.Move( fnMoveBackward, fnGoNode );
+ aCursor.Move( fnMoveBackward, GoInNode );
bRet = GetDoc()->MoveParagraph( aCursor, nOffset );
}
}
else if( (bUpperLeft ? nUpperLevel : nLowerLevel+1) < MAXLEVEL )
{
- aCursor.Move( fnMoveBackward, fnGoNode );
+ aCursor.Move( fnMoveBackward, GoInNode );
bRet = GetDoc()->NumUpDown( aCursor, !bUpperLeft );
}
}
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 950e79b6c38d..befb2cb7d113 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -175,7 +175,7 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
SwContentNode* pCNd = pCursor->GetContentNode();
if( !pCNd )
- pCursor->Move( fnMoveForward, fnGoContent );
+ pCursor->Move( fnMoveForward, GoInContent );
else
pCursor->GetPoint()->nContent.Assign( pCNd, 0 );