summaryrefslogtreecommitdiff
path: root/sw/source/core/doc/doccorr.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/doc/doccorr.cxx')
-rw-r--r--sw/source/core/doc/doccorr.cxx96
1 files changed, 48 insertions, 48 deletions
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 278d7f2a4a6d..b78d308edd46 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -35,9 +35,9 @@
namespace
{
- /// find the relevant section in which the SwUnoCrsr may wander.
+ /// find the relevant section in which the SwUnoCursor may wander.
/// returns NULL if no restrictions apply
- static const SwStartNode* lcl_FindUnoCrsrSection( const SwNode& rNode )
+ static const SwStartNode* lcl_FindUnoCursorSection( const SwNode& rNode )
{
const SwStartNode* pStartNode = rNode.StartOfSectionNode();
while( ( pStartNode != nullptr ) &&
@@ -95,35 +95,35 @@ void PaMCorrAbs( const SwPaM& rRange,
SwPosition const aEnd( *rRange.End() );
SwPosition const aNewPos( rNewPos );
SwDoc *const pDoc = aStart.nNode.GetNode().GetDoc();
- SwCrsrShell *const pShell = pDoc->GetEditShell();
+ SwCursorShell *const pShell = pDoc->GetEditShell();
if( pShell )
{
for(const SwViewShell& rShell : pShell->GetRingContainer())
{
- if(dynamic_cast<const SwCrsrShell *>(&rShell) == nullptr)
+ if(dynamic_cast<const SwCursorShell *>(&rShell) == nullptr)
continue;
- const SwCrsrShell* pCrsrShell = static_cast<const SwCrsrShell*>(&rShell);
- SwPaM *_pStkCrsr = pCrsrShell->GetStkCrsr();
- if( _pStkCrsr )
+ const SwCursorShell* pCursorShell = static_cast<const SwCursorShell*>(&rShell);
+ SwPaM *_pStackCursor = pCursorShell->GetStackCursor();
+ if( _pStackCursor )
do {
- lcl_PaMCorrAbs( *_pStkCrsr, aStart, aEnd, aNewPos );
- } while ( (_pStkCrsr != nullptr ) &&
- ((_pStkCrsr = static_cast<SwPaM *>(_pStkCrsr->GetNext())) != pCrsrShell->GetStkCrsr()) );
+ lcl_PaMCorrAbs( *_pStackCursor, aStart, aEnd, aNewPos );
+ } while ( (_pStackCursor != nullptr ) &&
+ ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) );
- for(SwPaM& rPaM : const_cast<SwShellCrsr*>(pCrsrShell->_GetCrsr())->GetRingContainer())
+ for(SwPaM& rPaM : const_cast<SwShellCursor*>(pCursorShell->_GetCursor())->GetRingContainer())
{
lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
}
- if( pCrsrShell->IsTableMode() )
- lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCrsrShell->GetTableCrs()), aStart, aEnd, aNewPos );
+ if( pCursorShell->IsTableMode() )
+ lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCursorShell->GetTableCrs()), aStart, aEnd, aNewPos );
}
}
- for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTable)
+ for(const auto& pWeakUnoCursor : pDoc->mvUnoCursorTable)
{
- auto pUnoCursor(pWeakUnoCrsr.lock());
+ auto pUnoCursor(pWeakUnoCursor.lock());
if(!pUnoCursor)
continue;
@@ -133,8 +133,8 @@ void PaMCorrAbs( const SwPaM& rRange,
// section
bool const bLeaveSection =
pUnoCursor->IsRemainInSection() &&
- ( lcl_FindUnoCrsrSection( aNewPos.nNode.GetNode() ) !=
- lcl_FindUnoCrsrSection(
+ ( lcl_FindUnoCursorSection( aNewPos.nNode.GetNode() ) !=
+ lcl_FindUnoCursorSection(
pUnoCursor->GetPoint()->nNode.GetNode() ) );
for(SwPaM& rPaM : pUnoCursor->GetRingContainer())
@@ -142,11 +142,11 @@ void PaMCorrAbs( const SwPaM& rRange,
bChange |= lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
}
- SwUnoTableCrsr *const pUnoTableCrsr =
- dynamic_cast<SwUnoTableCrsr *>(pUnoCursor.get());
- if( pUnoTableCrsr )
+ SwUnoTableCursor *const pUnoTableCursor =
+ dynamic_cast<SwUnoTableCursor *>(pUnoCursor.get());
+ if( pUnoTableCursor )
{
- for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM : (&pUnoTableCursor->GetSelRing())->GetRingContainer())
{
bChange |=
lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
@@ -167,7 +167,7 @@ void PaMCorrAbs( const SwPaM& rRange,
void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset,
- bool bMoveCrsr)
+ bool bMoveCursor)
{
SwContentNode *const pContentNode( rOldNode.GetNode().GetContentNode() );
SwPaM const aPam(rOldNode, 0,
@@ -200,7 +200,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
// To-Do - need to add here 'SwExtraRedlineTable' also ?
}
- if(bMoveCrsr)
+ if(bMoveCursor)
{
::PaMCorrAbs(aPam, aNewPos);
}
@@ -209,7 +209,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
void SwDoc::CorrAbs(
const SwPaM& rRange,
const SwPosition& rNewPos,
- bool bMoveCrsr )
+ bool bMoveCursor )
{
SwPosition aStart(*rRange.Start());
SwPosition aEnd(*rRange.End());
@@ -217,7 +217,7 @@ void SwDoc::CorrAbs(
_DelBookmarks( aStart.nNode, aEnd.nNode, nullptr, &aStart.nContent, &aEnd.nContent );
- if(bMoveCrsr)
+ if(bMoveCursor)
::PaMCorrAbs(rRange, rNewPos);
}
@@ -225,11 +225,11 @@ void SwDoc::CorrAbs(
const SwNodeIndex& rStartNode,
const SwNodeIndex& rEndNode,
const SwPosition& rNewPos,
- bool bMoveCrsr )
+ bool bMoveCursor )
{
_DelBookmarks( rStartNode, rEndNode );
- if(bMoveCrsr)
+ if(bMoveCursor)
{
SwContentNode *const pContentNode( rEndNode.GetNode().GetContentNode() );
SwPaM const aPam(rStartNode, 0,
@@ -248,47 +248,47 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
const sal_Int32 nCntIdx = rNewPos.nContent.GetIndex() + nOffset;
- SwCrsrShell const* pShell = pDoc->GetEditShell();
+ SwCursorShell const* pShell = pDoc->GetEditShell();
if( pShell )
{
for(const SwViewShell& rShell : pShell->GetRingContainer())
{
- if(dynamic_cast<const SwCrsrShell *>(&rShell) == nullptr)
+ if(dynamic_cast<const SwCursorShell *>(&rShell) == nullptr)
continue;
- SwCrsrShell* pCrsrShell = const_cast<SwCrsrShell*>(static_cast<const SwCrsrShell*>(&rShell));
- SwPaM *_pStkCrsr = pCrsrShell->GetStkCrsr();
- if( _pStkCrsr )
+ SwCursorShell* pCursorShell = const_cast<SwCursorShell*>(static_cast<const SwCursorShell*>(&rShell));
+ SwPaM *_pStackCursor = pCursorShell->GetStackCursor();
+ if( _pStackCursor )
do {
- lcl_PaMCorrRel1( _pStkCrsr, pOldNode, aNewPos, nCntIdx );
- } while ( (_pStkCrsr != nullptr ) &&
- ((_pStkCrsr = static_cast<SwPaM *>(_pStkCrsr->GetNext())) != pCrsrShell->GetStkCrsr()) );
+ lcl_PaMCorrRel1( _pStackCursor, pOldNode, aNewPos, nCntIdx );
+ } while ( (_pStackCursor != nullptr ) &&
+ ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) );
- SwPaM* pStartPaM = pCrsrShell->_GetCrsr();
+ SwPaM* pStartPaM = pCursorShell->_GetCursor();
for(SwPaM& rPaM : pStartPaM->GetRingContainer())
{
lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx);
}
- if( pCrsrShell->IsTableMode() )
- lcl_PaMCorrRel1( pCrsrShell->GetTableCrs(), pOldNode, aNewPos, nCntIdx );
+ if( pCursorShell->IsTableMode() )
+ lcl_PaMCorrRel1( pCursorShell->GetTableCrs(), pOldNode, aNewPos, nCntIdx );
}
}
- for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTable)
+ for(const auto& pWeakUnoCursor : pDoc->mvUnoCursorTable)
{
- auto pUnoCrsr(pWeakUnoCrsr.lock());
- if(!pUnoCrsr)
+ auto pUnoCursor(pWeakUnoCursor.lock());
+ if(!pUnoCursor)
continue;
- for(SwPaM& rPaM : pUnoCrsr->GetRingContainer())
+ for(SwPaM& rPaM : pUnoCursor->GetRingContainer())
{
lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
}
- SwUnoTableCrsr* pUnoTableCrsr =
- dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
- if( pUnoTableCrsr )
+ SwUnoTableCursor* pUnoTableCursor =
+ dynamic_cast<SwUnoTableCursor*>(pUnoCursor.get());
+ if( pUnoTableCursor )
{
- for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM : (&pUnoTableCursor->GetSelRing())->GetRingContainer())
{
lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
}
@@ -299,7 +299,7 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset,
- bool bMoveCrsr)
+ bool bMoveCursor)
{
getIDocumentMarkAccess()->correctMarksRelative(rOldNode, rNewPos, nOffset);
@@ -315,7 +315,7 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
// To-Do - need to add here 'SwExtraRedlineTable' also ?
}
- if(bMoveCrsr)
+ if(bMoveCursor)
::PaMCorrRel(rOldNode, rNewPos, nOffset);
}