diff options
Diffstat (limited to 'sw/source/core/edit/edglbldc.cxx')
-rw-r--r-- | sw/source/core/edit/edglbldc.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx index 9017f73e0213..694e71506811 100644 --- a/sw/source/core/edit/edglbldc.cxx +++ b/sw/source/core/edit/edglbldc.cxx @@ -142,11 +142,11 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos, SET_CURR_SHELL( this ); StartAllAction(); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); - SwPosition& rPos = *pCrsr->GetPoint(); + SwPosition& rPos = *pCursor->GetPoint(); rPos.nNode = rInsPos.GetDocPos(); bool bEndUndo = false; @@ -160,7 +160,7 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos, pMyDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, nullptr ); --rPos.nNode; pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos ); - pCrsr->SetMark(); + pCursor->SetMark(); } InsertSection( rNew ); @@ -183,11 +183,11 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos, SET_CURR_SHELL( this ); StartAllAction(); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); - SwPosition& rPos = *pCrsr->GetPoint(); + SwPosition& rPos = *pCursor->GetPoint(); rPos.nNode = rInsPos.GetDocPos(); bool bEndUndo = false; @@ -223,11 +223,11 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos ) SET_CURR_SHELL( this ); StartAllAction(); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); - SwPosition& rPos = *pCrsr->GetPoint(); + SwPosition& rPos = *pCursor->GetPoint(); rPos.nNode = rInsPos.GetDocPos() - 1; rPos.nContent.Assign( nullptr, 0 ); @@ -247,11 +247,11 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr , StartAllAction(); StartUndo( UNDO_START ); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); - SwPosition& rPos = *pCrsr->GetPoint(); + SwPosition& rPos = *pCursor->GetPoint(); SwDoc* pMyDoc = GetDoc(); const SwGlblDocContent& rDelPos = *rArr[ nDelPos ]; @@ -271,13 +271,13 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr , case GLBLDOC_UNKNOWN: { rPos.nNode = nDelIdx; - pCrsr->SetMark(); + pCursor->SetMark(); if( ++nDelPos < rArr.size() ) rPos.nNode = rArr[ nDelPos ]->GetDocPos(); else rPos.nNode = pMyDoc->GetNodes().GetEndOfContent(); --rPos.nNode; - if( !pMyDoc->getIDocumentContentOperations().DelFullPara( *pCrsr ) ) + if( !pMyDoc->getIDocumentContentOperations().DelFullPara( *pCursor ) ) Delete(); } break; @@ -315,8 +315,8 @@ bool SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr , SET_CURR_SHELL( this ); StartAllAction(); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); SwDoc* pMyDoc = GetDoc(); @@ -345,23 +345,23 @@ bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos ) return false; SET_CURR_SHELL( this ); - SttCrsrMove(); + SttCursorMove(); - SwPaM* pCrsr = GetCrsr(); - if( pCrsr->GetNext() != pCrsr || IsTableMode() ) + SwPaM* pCursor = GetCursor(); + if( pCursor->GetNext() != pCursor || IsTableMode() ) ClearMark(); - SwPosition& rCrsrPos = *pCrsr->GetPoint(); - rCrsrPos.nNode = rPos.GetDocPos(); + SwPosition& rCursorPos = *pCursor->GetPoint(); + rCursorPos.nNode = rPos.GetDocPos(); SwDoc* pMyDoc = GetDoc(); - SwContentNode * pCNd = rCrsrPos.nNode.GetNode().GetContentNode(); + SwContentNode * pCNd = rCursorPos.nNode.GetNode().GetContentNode(); if( !pCNd ) - pCNd = pMyDoc->GetNodes().GoNext( &rCrsrPos.nNode ); + pCNd = pMyDoc->GetNodes().GoNext( &rCursorPos.nNode ); - rCrsrPos.nContent.Assign( pCNd, 0 ); + rCursorPos.nContent.Assign( pCNd, 0 ); - EndCrsrMove(); + EndCursorMove(); return true; } |