sw/inc/node.hxx | 6
sw/inc/reffld.hxx | 8
sw/qa/core/uwriter.cxx | 4
sw/source/core/bastyp/index.cxx | 38 +-
sw/source/core/crsr/crsrsh.cxx | 12
sw/source/core/crsr/pam.cxx | 28 -
sw/source/core/crsr/trvltbl.cxx | 14
sw/source/core/doc/DocumentContentOperationsManager.cxx | 232 ++++++++--------
sw/source/core/doc/DocumentRedlineManager.cxx | 204 +++++++-------
sw/source/core/doc/doccomp.cxx | 6
sw/source/core/doc/docedt.cxx | 24 -
sw/source/core/doc/docfmt.cxx | 28 -
sw/source/core/doc/docftn.cxx | 8
sw/source/core/doc/docnum.cxx | 22 -
sw/source/core/doc/docredln.cxx | 50 +--
sw/source/core/doc/docruby.cxx | 20 -
sw/source/core/doc/swserv.cxx | 12
sw/source/core/docnode/ndsect.cxx | 22 -
sw/source/core/docnode/ndtbl.cxx | 34 +-
sw/source/core/docnode/node.cxx | 28 -
sw/source/core/docnode/nodes.cxx | 34 +-
sw/source/core/edit/edattr.cxx | 26 -
sw/source/core/edit/edlingu.cxx | 6
sw/source/core/edit/ednumber.cxx | 8
sw/source/core/edit/edsect.cxx | 12
sw/source/core/edit/edtox.cxx | 6
sw/source/core/fields/cellfml.cxx | 12
sw/source/core/fields/reffld.cxx | 48 +--
sw/source/core/frmedt/fetab.cxx | 4
sw/source/core/inc/DocumentContentOperationsManager.hxx | 4
sw/source/core/inc/UndoDelete.hxx | 2
sw/source/core/inc/pamtyp.hxx | 6
sw/source/core/undo/undel.cxx | 42 +-
sw/source/core/undo/undobj.cxx | 86 ++---
sw/source/core/undo/unins.cxx | 10
sw/source/filter/ascii/parasc.cxx | 68 ++--
sw/source/filter/basflt/fltshell.cxx | 8
sw/source/filter/ww8/wrtw8nds.cxx | 22 -
38 files changed, 602 insertions(+), 602 deletions(-)
New commits:
commit 8ed36f20b983ef9b1bf9cafc59c2523130f6be0f
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jan 18 19:19:14 2025 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Feb 10 19:35:03 2025 +0100
pass param by reference in GoNext/GoPrevious
to enforce that they are never nullptr
Change-Id: I973dcc143b5334c3060a0f815474e569deae4c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180459
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <a...@collabora.com>
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index dd16cff8c7a8..c721fc12cac5 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -436,9 +436,9 @@ public:
bool CanJoinNext( SwPosition* pIdx ) const;
SW_DLLPUBLIC bool CanJoinPrev( SwNodeIndex* pIdx =nullptr ) const;
- bool GoNext(SwContentIndex *, SwCursorSkipMode nMode ) const;
- bool GoNext(SwPosition*, SwCursorSkipMode nMode ) const;
- bool GoPrevious(SwContentIndex *, SwCursorSkipMode nMode ) const;
+ bool GoNext(SwContentIndex&, SwCursorSkipMode nMode ) const;
+ bool GoNext(SwPosition&, SwCursorSkipMode nMode ) const;
+ bool GoPrevious(SwContentIndex&, SwCursorSkipMode nMode ) const;
/// @see GetFrameOfModify
SW_DLLPUBLIC SwContentFrame *getLayoutFrame( const SwRootFrame*,
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index abfce2412516..accab026c468 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -2473,7 +2473,7 @@ void SwDocTest::testSetRubyList()
SwPosition aNewPos{ aPaM.GetPoint()->nNode, aPaM.GetPoint()->nContent
};
const SwTextNode* pTNd = aNewPos.GetNode().GetTextNode();
- pTNd->GoNext(&aNewPos, SwCursorSkipMode::Chars);
+ pTNd->GoNext(aNewPos, SwCursorSkipMode::Chars);
SwPaM aEmptyPaM{ aNewPos };
aEmptyPaM.SetMark();
@@ -2544,7 +2544,7 @@ void SwDocTest::testSetRubyList()
SwPosition aNewPos{ aPaM.GetPoint()->nNode, aPaM.GetPoint()->nContent
};
const SwTextNode* pTNd = aNewPos.GetNode().GetTextNode();
- pTNd->GoNext(&aNewPos, SwCursorSkipMode::Chars);
+ pTNd->GoNext(aNewPos, SwCursorSkipMode::Chars);
SwPaM aEmptyPaM{ aNewPos };
aEmptyPaM.SetMark();
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index be32e6d47676..3d10b1aacc12 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -378,17 +378,17 @@ bool CheckNodesRange( const SwNode& rStt,
return false; // somewhere in between => error
}
-bool GoNext(SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode )
+bool GoNext(SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode )
{
- if( pNd->IsContentNode() )
- return static_cast<SwContentNode*>(pNd)->GoNext( pIdx, nMode );
+ if( rNd.IsContentNode() )
+ return static_cast<SwContentNode&>(rNd).GoNext( rIdx, nMode );
return false;
}
-bool GoPrevious( SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode )
+bool GoPrevious( SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode )
{
- if( pNd->IsContentNode() )
- return static_cast<SwContentNode*>(pNd)->GoPrevious( pIdx, nMode );
+ if( rNd.IsContentNode() )
+ return static_cast<SwContentNode&>(rNd).GoPrevious( rIdx, nMode );
return false;
}
@@ -1205,32 +1205,32 @@ bool GoInNode( SwPaM & rPam, SwMoveFnCollection const &
fnMove )
bool GoInContent( SwPaM & rPam, SwMoveFnCollection const & fnMove )
{
- if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Chars ))
+ if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+ rPam.GetPoint()->nContent, SwCursorSkipMode::Chars ))
return true;
return GoInNode( rPam, fnMove );
}
bool GoInContentCells( SwPaM & rPam, SwMoveFnCollection const & fnMove )
{
- if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Cells ))
+ if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+ rPam.GetPoint()->nContent, SwCursorSkipMode::Cells ))
return true;
return GoInNode( rPam, fnMove );
}
bool GoInContentSkipHidden( SwPaM & rPam, SwMoveFnCollection const & fnMove )
{
- if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Chars |
SwCursorSkipMode::Hidden ) )
+ if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+ rPam.GetPoint()->nContent, SwCursorSkipMode::Chars |
SwCursorSkipMode::Hidden ) )
return true;
return GoInNode( rPam, fnMove );
}
bool GoInContentCellsSkipHidden( SwPaM & rPam, SwMoveFnCollection const &
fnMove )
{
- if( (*fnMove.fnNd)( &rPam.GetPoint()->GetNode(),
- &rPam.GetPoint()->nContent, SwCursorSkipMode::Cells |
SwCursorSkipMode::Hidden ) )
+ if( (*fnMove.fnNd)( rPam.GetPoint()->GetNode(),
+ rPam.GetPoint()->nContent, SwCursorSkipMode::Cells |
SwCursorSkipMode::Hidden ) )
return true;
return GoInNode( rPam, fnMove );
}
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 6eb4b4ad1422..e6f32a4e24e3 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -368,7 +368,7 @@ bool SwDoc::SelectNextRubyChars( SwPaM& rPam,
SwRubyListEntry& rEntry )
nWordEnd = nEnd;
}
}
- pTNd->GoNext( pPos, SwCursorSkipMode::Chars );
+ pTNd->GoNext( *pPos, SwCursorSkipMode::Chars );
nStart = pPos->GetContentIndex();
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index d32e717ea90a..b1f34f0a5a4f 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1278,26 +1278,26 @@ SwFormatColl *SwContentNode::ChgFormatColl(
SwFormatColl *pNewColl )
return pOldColl;
}
-bool SwContentNode::GoNext(SwPosition* pPos, SwCursorSkipMode nMode ) const
+bool SwContentNode::GoNext(SwPosition& rPos, SwCursorSkipMode nMode ) const
{
- if (!GoNext(&pPos->nContent, nMode))
+ if (!GoNext(rPos.nContent, nMode))
return false;
- if (pPos->nContent.GetContentNode() != &pPos->GetNode())
- pPos->nNode.Assign(*pPos->nContent.GetContentNode());
+ if (rPos.nContent.GetContentNode() != &rPos.GetNode())
+ rPos.nNode.Assign(*rPos.nContent.GetContentNode());
return true;
}
-bool SwContentNode::GoNext(SwContentIndex * pIdx, SwCursorSkipMode nMode )
const
+bool SwContentNode::GoNext(SwContentIndex& rIdx, SwCursorSkipMode nMode ) const
{
bool bRet = true;
- if( pIdx->GetIndex() < Len() )
+ if( rIdx.GetIndex() < Len() )
{
if( !IsTextNode() )
- ++(*pIdx);
+ ++rIdx;
else
{
const SwTextNode& rTNd = *GetTextNode();
- sal_Int32 nPos = pIdx->GetIndex();
+ sal_Int32 nPos = rIdx.GetIndex();
assert(g_pBreakIt && g_pBreakIt->GetBreakIter().is());
sal_Int32 nDone = 0;
sal_uInt16 nItrMode = ( SwCursorSkipMode::Cells & nMode ) ?
@@ -1318,7 +1318,7 @@ bool SwContentNode::GoNext(SwContentIndex * pIdx,
SwCursorSkipMode nMode ) const
}
if( 1 == nDone )
- *pIdx = nPos;
+ rIdx = nPos;
else
bRet = false;
}
@@ -1328,17 +1328,17 @@ bool SwContentNode::GoNext(SwContentIndex * pIdx,
SwCursorSkipMode nMode ) const
return bRet;
}
-bool SwContentNode::GoPrevious(SwContentIndex * pIdx, SwCursorSkipMode nMode )
const
+bool SwContentNode::GoPrevious(SwContentIndex& rIdx, SwCursorSkipMode nMode )
const
{
bool bRet = true;
- if( pIdx->GetIndex() > 0 )
+ if( rIdx.GetIndex() > 0 )
{
if( !IsTextNode() )
- --(*pIdx);
+ --rIdx;
else
{
const SwTextNode& rTNd = *GetTextNode();
- sal_Int32 nPos = pIdx->GetIndex();
+ sal_Int32 nPos = rIdx.GetIndex();
assert(g_pBreakIt && g_pBreakIt->GetBreakIter().is());
sal_Int32 nDone = 0;
sal_uInt16 nItrMode = ( SwCursorSkipMode::Cells & nMode ) ?
@@ -1359,7 +1359,7 @@ bool SwContentNode::GoPrevious(SwContentIndex * pIdx,
SwCursorSkipMode nMode ) c
}
if( 1 == nDone )
- *pIdx = nPos;
+ rIdx = nPos;
else
bRet = false;
}
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 1dfc2877628f..624a2e663ddb 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -678,7 +678,7 @@ SvtScriptType SwEditShell::GetScriptType() const
if( nPos )
{
SwContentIndex aIdx( pStart->GetContentNode(),
pStart->GetContentIndex() );
- if( pTNd->GoPrevious( &aIdx, SwCursorSkipMode::Chars )
)
+ if( pTNd->GoPrevious( aIdx, SwCursorSkipMode::Chars ) )
nPos = aIdx.GetIndex();
}
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index d8c1110dea8c..30e53f1d2848 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -54,15 +54,15 @@ void GoEndOfSection( SwPosition*);
const SwTextAttr* GetFrwrdTextHint( const SwpHints&, size_t&, sal_Int32 );
const SwTextAttr* GetBkwrdTextHint( const SwpHints&, size_t&, sal_Int32 );
-bool GoNext(SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode );
-bool GoPrevious(SwNode* pNd, SwContentIndex * pIdx, SwCursorSkipMode nMode );
+bool GoNext(SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode );
+bool GoPrevious(SwNode& rNd, SwContentIndex& rIdx, SwCursorSkipMode nMode );
SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool );
SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
SwContentNode* GoNextPos( SwPosition * pIdx, bool );
SwContentNode* GoPreviousPos( SwPosition * pIdx, bool );
// type definitions of functions
-typedef bool (*GoNd)( SwNode*, SwContentIndex*, SwCursorSkipMode );
+typedef bool (*GoNd)( SwNode&, SwContentIndex&, SwCursorSkipMode );
typedef SwContentNode* (*GoNds)( SwNodeIndex*, bool );
typedef SwContentNode* (*GoPos)( SwPosition*, bool );
typedef void (*GoDoc)( SwPosition* );
commit 967287e783e102e77cc141cfd217df22afc20f39
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Dec 17 10:12:41 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Feb 10 19:35:03 2025 +0100
sw: pStt -> pStart
Change-Id: If2d8574e732581b5726734e2ac24196242a52d8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178642
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 2adc2f3a3244..f50219df9885 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -96,7 +96,7 @@ public:
static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
sal_uInt16 nSubType, sal_uInt16
nSeqNo, sal_uInt16 nFlags,
- sal_Int32* pStt, sal_Int32* pEnd =
nullptr,
+ sal_Int32* pStart, sal_Int32* pEnd =
nullptr,
SwRootFrame const* pLayout = nullptr,
SwTextNode* pSelf = nullptr, SwFrame*
pFrame = nullptr);
void UpdateGetReferences();
@@ -105,16 +105,16 @@ public:
private:
static SwTextNode* FindAnchorRefStyle( SwDoc* pDoc, const OUString&
rRefMark,
sal_uInt16 nFlags,
- sal_Int32* pStt, sal_Int32* pEnd,
+ sal_Int32* pStart, sal_Int32* pEnd,
SwRootFrame const* pLayout,
SwTextNode* pSelf, SwFrame* pFrame);
static SwTextNode* FindAnchorRefStyleMarginal( SwDoc* pDoc,
sal_uInt16 nFlags,
- sal_Int32* pStt, sal_Int32* pEnd,
+ sal_Int32* pStart, sal_Int32* pEnd,
SwTextNode* pSelf, SwFrame* pFrame,
const SwTextNode* pReference,
std::u16string_view styleName);
static SwTextNode* FindAnchorRefStyleOther( SwDoc* pDoc,
- sal_Int32* pStt, sal_Int32* pEnd,
+ sal_Int32* pStart, sal_Int32* pEnd,
SwTextNode* pSelf,
const SwTextNode* pReference,
std::u16string_view styleName);
};
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 39eebfcd713e..ac331a20d09b 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -233,43 +233,43 @@ void SwContentIndexReg::Update(
const sal_Int32 nDiff,
UpdateMode const eMode)
{
- SwContentIndex* pStt = const_cast<SwContentIndex*>(&rIdx);
+ SwContentIndex* pStart = const_cast<SwContentIndex*>(&rIdx);
const sal_Int32 nNewVal = rIdx.m_nIndex;
if (eMode & UpdateMode::Negative)
{
const sal_Int32 nLast = rIdx.m_nIndex + nDiff;
- pStt = rIdx.m_pNext;
+ pStart = rIdx.m_pNext;
// skip over the ones that already have the right value
- while (pStt && pStt->m_nIndex == nNewVal)
- pStt = pStt->m_pNext;
- while (pStt && pStt->m_nIndex <= nLast)
+ while (pStart && pStart->m_nIndex == nNewVal)
+ pStart = pStart->m_pNext;
+ while (pStart && pStart->m_nIndex <= nLast)
{
- pStt->m_nIndex = nNewVal;
- pStt = pStt->m_pNext;
+ pStart->m_nIndex = nNewVal;
+ pStart = pStart->m_pNext;
}
- while( pStt )
+ while( pStart )
{
- pStt->m_nIndex = pStt->m_nIndex - nDiff;
- pStt = pStt->m_pNext;
+ pStart->m_nIndex = pStart->m_nIndex - nDiff;
+ pStart = pStart->m_pNext;
}
}
else
{
- while (pStt && pStt->m_nIndex == nNewVal)
+ while (pStart && pStart->m_nIndex == nNewVal)
{
- pStt->m_nIndex = pStt->m_nIndex + nDiff;
- pStt = pStt->m_pPrev;
+ pStart->m_nIndex = pStart->m_nIndex + nDiff;
+ pStart = pStart->m_pPrev;
}
- pStt = rIdx.m_pNext;
- while( pStt )
+ pStart = rIdx.m_pNext;
+ while( pStart )
{
// HACK: avoid updating position of cross-ref bookmarks
- if (pStt->m_pOwner && pStt->m_pOwner->GetOwnerType() ==
SwContentIndexOwnerType::Mark
- && dynamic_cast< ::sw::mark::CrossRefBookmark
const*>(pStt->m_pOwner))
+ if (pStart->m_pOwner && pStart->m_pOwner->GetOwnerType() ==
SwContentIndexOwnerType::Mark
+ && dynamic_cast< ::sw::mark::CrossRefBookmark
const*>(pStart->m_pOwner))
; // do nothing
else
- pStt->m_nIndex = pStt->m_nIndex + nDiff;
- pStt = pStt->m_pNext;
+ pStart->m_nIndex = pStart->m_nIndex + nDiff;
+ pStart = pStart->m_pNext;
}
}
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 3c026b0f6391..4f7e457be8ba 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -87,7 +87,7 @@ using namespace com::sun::star;
*/
static void CheckRange( SwCursor* pCurrentCursor )
{
- auto [pStt, pEnd] = pCurrentCursor->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pCurrentCursor->StartEnd(); // SwPosition*
SwPaM *pTmpDel = nullptr,
*pTmp = pCurrentCursor->GetNext();
@@ -96,14 +96,14 @@ static void CheckRange( SwCursor* pCurrentCursor )
while( pTmp != pCurrentCursor )
{
auto [pTmpStt, pTmpEnd] = pTmp->StartEnd(); // SwPosition*
- if( *pStt <= *pTmpStt )
+ if( *pStart <= *pTmpStt )
{
if( *pEnd > *pTmpStt ||
( *pEnd == *pTmpStt && *pEnd == *pTmpEnd ))
pTmpDel = pTmp;
}
else
- if( *pStt < *pTmpEnd )
+ if( *pStart < *pTmpEnd )
pTmpDel = pTmp;
// If Point or Mark is within the Cursor range, we need to remove the
old
@@ -3221,7 +3221,7 @@ bool SwCursorShell::ParkTableCursor()
void SwCursorShell::ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing )
{
- auto [pStt, pEnd] = pDelRg->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pDelRg->StartEnd(); // SwPosition*
SwPaM *pTmpDel = nullptr, *pTmp = *ppDelRing;
@@ -3235,14 +3235,14 @@ void SwCursorShell::ParkPams( SwPaM* pDelRg,
SwShellCursor** ppDelRing )
auto [pTmpStt, pTmpEnd] = pTmp->StartEnd(); // SwPosition*
// If a SPoint or GetMark are in a cursor area then cancel the old
area.
// During comparison keep in mind that End() is outside the area.
- if( *pStt <= *pTmpStt )
+ if( *pStart <= *pTmpStt )
{
if( *pEnd > *pTmpStt ||
( *pEnd == *pTmpStt && *pEnd == *pTmpEnd ))
pTmpDel = pTmp;
}
else
- if( *pStt < *pTmpEnd )
+ if( *pStart < *pTmpEnd )
pTmpDel = pTmp;
bGoNext = true;
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index b16b40122a26..898024771dba 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -137,7 +137,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
CurrShell aCurr( this );
- const SwTableBox* pStt = nullptr;
+ const SwTableBox* pStart = nullptr;
const SwTableBox* pEnd = nullptr;
// search box based on layout
@@ -155,7 +155,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
if( aBoxes.empty() )
return false;
- pStt = aBoxes[0];
+ pStart = aBoxes[0];
pEnd = aBoxes.back();
}
// #i32329# Enhanced table selection
@@ -167,7 +167,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
if( aBoxes.empty() )
return false;
- pStt = aBoxes[0];
+ pStart = aBoxes[0];
pEnd = aBoxes.back();
m_eEnhancedTableSel = eSearchType;
@@ -193,7 +193,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
const bool bVert = pFrame->ImplFindTabFrame()->IsVertical();
- // If we select upwards it is sufficient to set pStt and pEnd
+ // If we select upwards it is sufficient to set pStart and pEnd
// to the first resp. last box of the selection obtained from
// GetTableSel. However, selecting downwards requires the frames
// located at the corners of the selection. This does not work
@@ -210,13 +210,13 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
if ( bSelectUp )
{
- pStt = aBoxes[0];
+ pStart = aBoxes[0];
pEnd = aBoxes.back();
}
else
{
// will become point of table cursor
- pStt = aCells[bVert ? 0 : (bRow ? 2 : 1)]->GetTabBox();
+ pStart = aCells[bVert ? 0 : (bRow ? 2 : 1)]->GetTabBox();
// will become mark of table cursor
pEnd = aCells[bVert ? 3 : (bRow ? 1 : 2)]->GetTabBox();
}
@@ -236,7 +236,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool
bRowSimple )
m_pTableCursor->GetPoint()->Assign( *pEnd->GetSttNd()->EndOfSectionNode()
);
m_pTableCursor->Move( fnMoveBackward, GoInContent );
m_pTableCursor->SetMark();
- m_pTableCursor->GetPoint()->Assign( *pStt->GetSttNd()->EndOfSectionNode()
);
+ m_pTableCursor->GetPoint()->Assign(
*pStart->GetSttNd()->EndOfSectionNode() );
m_pTableCursor->Move( fnMoveBackward, GoInContent );
// set PtPos 'close' to the reference table, otherwise we might get
problems
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 8f0302b7f101..9a343ef10a92 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -374,13 +374,13 @@ namespace
SwDoc& rDestDoc = rCpyPam.GetDoc();
SwPosition* pCpyStt = rCpyPam.Start(), *pCpyEnd = rCpyPam.End();
std::unique_ptr<SwPaM> pDelPam;
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
// We have to count the "non-copied" nodes
SwNodeOffset nDelCount;
SwNodeIndex aCorrIdx(InitDelCount(rPam, nDelCount));
SwRedlineTable::size_type n = 0;
- rSrcDoc.getIDocumentRedlineAccess().GetRedline( *pStt, &n );
+ rSrcDoc.getIDocumentRedlineAccess().GetRedline( *pStart, &n );
for( ; n < rTable.size(); ++n )
{
const SwRangeRedline* pRedl = rTable[ n ];
@@ -388,7 +388,7 @@ namespace
{
auto [pRStt, pREnd] = pRedl->StartEnd(); // SwPosition*
- SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd,
*pRStt, *pREnd );
+ SwComparePosition eCmpPos = ComparePosition( *pStart, *pEnd,
*pRStt, *pREnd );
switch( eCmpPos )
{
case SwComparePosition::CollideEnd:
@@ -405,10 +405,10 @@ namespace
default:
{
pDelPam.reset(new SwPaM( *pCpyStt, pDelPam.release()
));
- if( *pStt < *pRStt )
+ if( *pStart < *pRStt )
{
lcl_NonCopyCount( rPam, aCorrIdx,
pRStt->GetNodeIndex(), nDelCount );
- lcl_SetCpyPos( *pRStt, *pStt, *pCpyStt,
+ lcl_SetCpyPos( *pRStt, *pStart, *pCpyStt,
*pDelPam->GetPoint(), nDelCount );
}
pDelPam->SetMark();
@@ -418,7 +418,7 @@ namespace
else
{
lcl_NonCopyCount( rPam, aCorrIdx,
pREnd->GetNodeIndex(), nDelCount );
- lcl_SetCpyPos( *pREnd, *pStt, *pCpyStt,
+ lcl_SetCpyPos( *pREnd, *pStart, *pCpyStt,
*pDelPam->GetPoint(), nDelCount );
}
@@ -519,15 +519,15 @@ namespace
bool lcl_MarksWholeNode(const SwPaM & rPam)
{
bool bResult = false;
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
- if (nullptr != pStt && nullptr != pEnd)
+ if (nullptr != pStart && nullptr != pEnd)
{
- const SwTextNode* pSttNd = pStt->GetNode().GetTextNode();
+ const SwTextNode* pSttNd = pStart->GetNode().GetTextNode();
const SwTextNode* pEndNd = pEnd->GetNode().GetTextNode();
if (nullptr != pSttNd && nullptr != pEndNd &&
- pStt->GetContentIndex() == 0 &&
+ pStart->GetContentIndex() == 0 &&
pEnd->GetContentIndex() == pEndNd->Len())
{
bResult = true;
@@ -729,11 +729,11 @@ namespace
// the string doesn't exceed the allowed string length
if( rPam.GetPoint()->GetNode() != rPam.GetMark()->GetNode() )
{
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
const SwTextNode* pEndNd = pEnd->GetNode().GetTextNode();
- if( (nullptr != pEndNd) && pStt->GetNode().IsTextNode() )
+ if( (nullptr != pEndNd) && pStart->GetNode().IsTextNode() )
{
- const sal_uInt64 nSum = pStt->GetContentIndex() +
+ const sal_uInt64 nSum = pStart->GetContentIndex() +
pEndNd->GetText().getLength() - pEnd->GetContentIndex();
return nSum > o3tl::make_unsigned(SAL_MAX_INT32);
}
@@ -753,10 +753,10 @@ namespace
, nEnd(0)
, nEndCnt(0)
{
- auto [pStt, pEnd] = pR->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pR->StartEnd(); // SwPosition*
SwNodeOffset nSttIdx = rSttIdx.GetIndex();
- nStt = pStt->GetNodeIndex() - nSttIdx;
- nSttCnt = pStt->GetContentIndex();
+ nStt = pStart->GetNodeIndex() - nSttIdx;
+ nSttCnt = pStart->GetContentIndex();
if( pR->HasMark() )
{
nEnd = pEnd->GetNodeIndex() - nSttIdx;
@@ -772,10 +772,10 @@ namespace
, nEnd(0)
, nEndCnt(0)
{
- auto [pStt, pEnd] = pR->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pR->StartEnd(); // SwPosition*
SwNodeOffset nSttIdx = rPos.GetNodeIndex();
- nStt = pStt->GetNodeIndex() - nSttIdx;
- nSttCnt = pStt->GetContentIndex();
+ nStt = pStart->GetNodeIndex() - nSttIdx;
+ nSttCnt = pStart->GetContentIndex();
if( nStt == SwNodeOffset(0) )
nSttCnt = nSttCnt - rPos.GetContentIndex();
if( pR->HasMark() )
@@ -1473,8 +1473,8 @@ namespace //local functions originally from docfmt.cxx
SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : nullptr;
bool bRet = false;
- const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
- SwContentNode* pNode = pStt->GetNode().GetContentNode();
+ const SwPosition *pStart = rRg.Start(), *pEnd = rRg.End();
+ SwContentNode* pNode = pStart->GetNode().GetContentNode();
if( pNode && pNode->IsTextNode() )
{
@@ -1491,7 +1491,7 @@ namespace //local functions originally from docfmt.cxx
{
if
(pCurrentNode->GetSwAttrSet().HasItem(RES_PARATR_LIST_AUTOFMT) &&
// remove character formatting only on wholly selected
paragraphs
- (nStartIndex < pCurrentNode->GetIndex() ||
pStt->GetContentIndex() == 0) &&
+ (nStartIndex < pCurrentNode->GetIndex() ||
pStart->GetContentIndex() == 0) &&
(pCurrentNode->GetIndex() < nEndIndex ||
pEnd->GetContentIndex() == pEndNode->Len()))
{
pCurrentNode->ResetAttr(RES_PARATR_LIST_AUTOFMT);
@@ -1553,13 +1553,13 @@ namespace //local functions originally from docfmt.cxx
{
SwRegHistory history( pNode, *pNode, pHistory );
bRet = history.InsertItems(
- aTextSet, pStt->GetContentIndex(),
pStt->GetContentIndex(), nFlags, /*ppNewTextAttr*/nullptr ) || bRet;
+ aTextSet, pStart->GetContentIndex(),
pStart->GetContentIndex(), nFlags, /*ppNewTextAttr*/nullptr ) || bRet;
if (bRet &&
(rDoc.getIDocumentRedlineAccess().IsRedlineOn() ||
(!rDoc.getIDocumentRedlineAccess().IsIgnoreRedline()
&&
!rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())))
{
- SwPaM aPam( pStt->GetNode(), pStt->GetContentIndex()-1,
- pStt->GetNode(), pStt->GetContentIndex() );
+ SwPaM aPam( pStart->GetNode(),
pStart->GetContentIndex()-1,
+ pStart->GetNode(),
pStart->GetContentIndex() );
if( pUndo )
pUndo->SaveRedlineData( aPam, true );
@@ -1586,8 +1586,8 @@ namespace //local functions originally from docfmt.cxx
aTextSet.Put( rChgSet );
if( aTextSet.Count() )
{
- const sal_Int32 nInsCnt = pStt->GetContentIndex();
- const sal_Int32 nEnd = pStt->GetNode() == pEnd->GetNode()
+ const sal_Int32 nInsCnt = pStart->GetContentIndex();
+ const sal_Int32 nEnd = pStart->GetNode() == pEnd->GetNode()
? pEnd->GetContentIndex()
: pNode->Len();
SwRegHistory history( pNode, *pNode, pHistory );
@@ -1598,10 +1598,10 @@ namespace //local functions originally from docfmt.cxx
&&
!rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())))
{
// Was text content inserted? (RefMark/TOXMarks
without an end)
- bool bTextIns = nInsCnt != pStt->GetContentIndex();
+ bool bTextIns = nInsCnt != pStart->GetContentIndex();
// Was content inserted or set over the selection?
- SwPaM aPam( pStt->GetNode(), bTextIns ? nInsCnt + 1 :
nEnd,
- pStt->GetNode(), nInsCnt );
+ SwPaM aPam( pStart->GetNode(), bTextIns ? nInsCnt + 1
: nEnd,
+ pStart->GetNode(), nInsCnt );
if( pUndo )
pUndo->SaveRedlineData( aPam, bTextIns );
@@ -1648,7 +1648,7 @@ namespace //local functions originally from docfmt.cxx
SwContentNode * pFirstNode(pNode);
if (pLayout && pLayout->HasMergedParas())
{
- pFirstNode = sw::GetFirstAndLastNode(*pLayout,
pStt->GetNode()).first;
+ pFirstNode = sw::GetFirstAndLastNode(*pLayout,
pStart->GetNode()).first;
}
SwRegHistory aRegH( pFirstNode, *pFirstNode, pHistory
);
bRet = pFirstNode->SetAttr( aNew ) || bRet;
@@ -1736,12 +1736,12 @@ namespace //local functions originally from docfmt.cxx
if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
{
SwTextNode* pTextNd = pNode->GetTextNode();
- sal_Int32 nMkPos, nPtPos = pStt->GetContentIndex();
+ sal_Int32 nMkPos, nPtPos = pStart->GetContentIndex();
const OUString& rStr = pTextNd->GetText();
// Special case: if the Cursor is located within a URL
attribute, we take over it's area
SwTextAttr const*const pURLAttr(
- pTextNd->GetTextAttrAt(pStt->GetContentIndex(),
RES_TXTATR_INETFMT));
+ pTextNd->GetTextAttrAt(pStart->GetContentIndex(),
RES_TXTATR_INETFMT));
if (pURLAttr &&
!pURLAttr->GetINetFormat().GetValue().isEmpty())
{
nMkPos = pURLAttr->GetStart();
@@ -1762,7 +1762,7 @@ namespace //local functions originally from docfmt.cxx
nPtPos = aBndry.endPos;
}
else
- nPtPos = nMkPos = pStt->GetContentIndex();
+ nPtPos = nMkPos = pStart->GetContentIndex();
}
// Remove the overriding attributes from the SwpHintsArray,
@@ -1835,17 +1835,17 @@ namespace //local functions originally from docfmt.cxx
if( pNode )
{
const sal_Int32 nLen = pNode->Len();
- if( pStt->GetNode() != pEnd->GetNode() )
+ if( pStart->GetNode() != pEnd->GetNode() )
aCntEnd.Assign( pNode, nLen );
- if( pStt->GetContentIndex() != 0 || aCntEnd.GetIndex() != nLen )
+ if( pStart->GetContentIndex() != 0 || aCntEnd.GetIndex() != nLen )
{
// the SwRegHistory inserts the attribute into the TextNode!
if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
{
SwRegHistory history( pNode, *pNode, pHistory );
bRet = history.InsertItems(*pCharSet,
- pStt->GetContentIndex(), aCntEnd.GetIndex(),
nFlags, /*ppNewTextAttr*/nullptr)
+ pStart->GetContentIndex(), aCntEnd.GetIndex(),
nFlags, /*ppNewTextAttr*/nullptr)
|| bRet;
}
@@ -1855,27 +1855,27 @@ namespace //local functions originally from docfmt.cxx
}
// Only selection in a Node.
- if( pStt->GetNode() == pEnd->GetNode() )
+ if( pStart->GetNode() == pEnd->GetNode() )
{
DELETECHARSETS
return bRet;
}
++nNodes;
- aSt.Assign( pStt->GetNode(), +1 );
+ aSt.Assign( pStart->GetNode(), +1 );
}
else
- aSt = pStt->GetNode();
+ aSt = pStart->GetNode();
aCntEnd.Assign(pEnd->GetContentNode(), pEnd->GetContentIndex());
// aEnd was changed!
}
else
- aSt.Assign( pStt->GetNode(), +1 );
+ aSt.Assign( pStart->GetNode(), +1 );
// aSt points to the first full Node now
/*
* The selection spans more than one Node.
*/
- if( pStt->GetNode() < pEnd->GetNode() )
+ if( pStart->GetNode() < pEnd->GetNode() )
{
pNode = pEnd->GetNode().GetContentNode();
if(pNode)
@@ -1914,7 +1914,7 @@ namespace //local functions originally from docfmt.cxx
if( pCharSet && pCharSet->Count() && !( SetAttrMode::DONTREPLACE &
nFlags ) )
{
::sw::DocumentContentOperationsManager::ParaRstFormat aPara(
- pStt, pEnd, pHistory, pCharSet, pLayout);
+ pStart, pEnd, pHistory, pCharSet, pLayout);
rDoc.GetNodes().ForEach( aSt, aEnd,
::sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
}
@@ -2023,24 +2023,24 @@ bool DocumentContentOperationsManager::CopyRange(SwPaM&
rPam, SwPosition& rPos,
SwCopyFlags const flags,
sal_uInt32 nMovedID) const
{
- const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
+ const SwPosition *pStart = rPam.Start(), *pEnd = rPam.End();
SwDoc& rDoc = rPos.GetNode().GetDoc();
bool bColumnSel = rDoc.IsClipBoard() && rDoc.IsColumnSelection();
// Catch if there's no copy to do
- if (!rPam.HasMark() || (IsEmptyRange(*pStt, *pEnd, flags) && !bColumnSel))
+ if (!rPam.HasMark() || (IsEmptyRange(*pStart, *pEnd, flags) &&
!bColumnSel))
return false;
// Prevent copying into Flys that are anchored in the source range
if (&rDoc == &m_rDoc && (flags & SwCopyFlags::CheckPosInFly))
{
// Correct the Start-/EndNode
- SwNodeOffset nStt = pStt->GetNodeIndex(),
+ SwNodeOffset nStt = pStart->GetNodeIndex(),
nEnd = pEnd->GetNodeIndex(),
nDiff = nEnd - nStt +1;
SwNode* pNd = m_rDoc.GetNodes()[ nStt ];
- if( pNd->IsContentNode() && pStt->GetContentIndex() )
+ if( pNd->IsContentNode() && pStart->GetContentIndex() )
{
++nStt;
--nDiff;
@@ -2071,9 +2071,9 @@ bool DocumentContentOperationsManager::CopyRange(SwPaM&
rPam, SwPosition& rPos,
{ // ordinary copy
bRet = CopyImpl(rPam, rPos, flags & ~SwCopyFlags::CheckPosInFly,
pRedlineRange ? &*pRedlineRange : nullptr);
}
- else if( ! ( *pStt <= rPos && rPos < *pEnd &&
- ( pStt->GetNode() != pEnd->GetNode() ||
- !pStt->GetNode().IsTextNode() )) )
+ else if( ! ( *pStart <= rPos && rPos < *pEnd &&
+ ( pStart->GetNode() != pEnd->GetNode() ||
+ !pStart->GetNode().IsTextNode() )) )
{
// Copy to a position outside of the area, or copy a single TextNode
// Do an ordinary copy
@@ -2387,8 +2387,8 @@ bool
DocumentContentOperationsManager::DeleteAndJoin(SwPaM & rPam, SwDeleteFlags
bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition&
rPos, SwMoveFlags eMvFlags )
{
// nothing moved: return
- const SwPosition *pStt = rPaM.Start(), *pEnd = rPaM.End();
- if( !rPaM.HasMark() || *pStt >= *pEnd || (*pStt <= rPos && rPos < *pEnd))
+ const SwPosition *pStart = rPaM.Start(), *pEnd = rPaM.End();
+ if( !rPaM.HasMark() || *pStart >= *pEnd || (*pStart <= rPos && rPos <
*pEnd))
return false;
assert(!sw::mark::IsFieldmarkOverlap(rPaM)); // probably an invalid
redline was created?
@@ -2409,10 +2409,10 @@ bool DocumentContentOperationsManager::MoveRange(
SwPaM& rPaM, SwPosition& rPos,
// here without undo.
::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo());
DelBookmarks(
- pStt->GetNode(),
+ pStart->GetNode(),
pEnd->GetNode(),
nullptr,
- pStt->GetContentIndex(),
+ pStart->GetContentIndex(),
pEnd->GetContentIndex());
}
@@ -2428,9 +2428,9 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
}
else
{
- bUpdateFootnote = lcl_SaveFootnote( pStt->GetNode(), pEnd->GetNode(),
rPos.GetNode(),
+ bUpdateFootnote = lcl_SaveFootnote( pStart->GetNode(),
pEnd->GetNode(), rPos.GetNode(),
m_rDoc.GetFootnoteIdxs(), aTmpFntIdx,
- pStt->GetContentIndex(),
pEnd->GetContentIndex() );
+ pStart->GetContentIndex(),
pEnd->GetContentIndex() );
}
bool bSplit = false;
@@ -2442,7 +2442,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
// If there is a TextNode before and after the Move, create a JoinNext in
the EditShell.
SwTextNode* pSrcNd = rPaM.GetPoint()->GetNode().GetTextNode();
- bool bCorrSavePam = pSrcNd && pStt->GetNode() != pEnd->GetNode();
+ bool bCorrSavePam = pSrcNd && pStart->GetNode() != pEnd->GetNode();
// If one or more TextNodes are moved, SwNodes::Move will do a SplitNode.
// However, this does not update the cursor. So we create a TextNode to
keep
@@ -2521,10 +2521,10 @@ bool DocumentContentOperationsManager::MoveRange(
SwPaM& rPaM, SwPosition& rPos,
// that saves the position as an offset.
std::vector< ::sw::mark::SaveBookmark> aSaveBkmks;
DelBookmarks(
- pStt->GetNode(),
+ pStart->GetNode(),
pEnd->GetNode(),
&aSaveBkmks,
- pStt->GetContentIndex(),
+ pStart->GetContentIndex(),
pEnd->GetContentIndex());
// If there is no range anymore due to the above deletions (e.g. the
@@ -2992,14 +2992,14 @@ void
DocumentContentOperationsManager::TransliterateText(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
pUndo.reset(new SwUndoTransliterate( rPaM, rTrans ));
- auto [pStt, pEnd] = rPaM.StartEnd(); // SwPosition*
- SwNodeOffset nSttNd = pStt->GetNodeIndex(),
+ auto [pStart, pEnd] = rPaM.StartEnd(); // SwPosition*
+ SwNodeOffset nSttNd = pStart->GetNodeIndex(),
nEndNd = pEnd->GetNodeIndex();
- sal_Int32 nSttCnt = pStt->GetContentIndex();
+ sal_Int32 nSttCnt = pStart->GetContentIndex();
sal_Int32 nEndCnt = pEnd->GetContentIndex();
- SwTextNode* pTNd = pStt->GetNode().GetTextNode();
- bool bNoSelection = (pStt == pEnd) && pTNd; // no selection?
+ SwTextNode* pTNd = pStart->GetNode().GetTextNode();
+ bool bNoSelection = (pStart == pEnd) && pTNd; // no selection?
if ( bNoSelection )
{
/* Check if cursor is inside of a word */
@@ -3032,9 +3032,9 @@ void DocumentContentOperationsManager::TransliterateText(
/* Recognize and reject the previous deleted and inserted words to
allow to cycle */
IDocumentRedlineAccess& rIDRA = m_rDoc.getIDocumentRedlineAccess();
if ( IDocumentRedlineAccess::IsShowChanges(
rIDRA.GetRedlineFlags() ) &&
- pStt->GetContentIndex() > 0 )
+ pStart->GetContentIndex() > 0 )
{
- SwPosition aPos(*pStt->GetContentNode(),
pStt->GetContentIndex() - 1);
+ SwPosition aPos(*pStart->GetContentNode(),
pStart->GetContentIndex() - 1);
SwRedlineTable::size_type n = 0;
const SwRangeRedline* pFnd =
@@ -3080,7 +3080,7 @@ void DocumentContentOperationsManager::TransliterateText(
if ( *pRedline->Start() > *pEnd )
break;
- if ( *pRedline->Start() >= *pStt )
+ if ( *pRedline->Start() >= *pStart )
n = m;
}
@@ -3102,8 +3102,8 @@ void DocumentContentOperationsManager::TransliterateText(
// not only the changes from the same author within the
(sometimes
// incomplete) selection
( pFnd2->GetTimeStamp() == pFnd->GetTimeStamp() ||
- ( pStt->GetContentNode() <
pFnd2->Start()->GetContentNode() ||
- ( pStt->GetContentNode() ==
pFnd2->Start()->GetContentNode() &&
+ ( pStart->GetContentNode() <
pFnd2->Start()->GetContentNode() ||
+ ( pStart->GetContentNode() ==
pFnd2->Start()->GetContentNode() &&
nSttCnt <= pFnd2->Start()->GetContentIndex() ) )
) &&
pFnd->GetAuthor() == pFnd2->GetAuthor() )
{
@@ -3150,7 +3150,7 @@ void DocumentContentOperationsManager::TransliterateText(
const bool bIsTitleCase = rTrans.getType() ==
TransliterationFlags::TITLE_CASE;
sal_uLong nAffectedNodes = 0;
sal_uLong nAffectedChars = nEndCnt;
- SwNodeIndex aIdx( pStt->GetNode() );
+ SwNodeIndex aIdx( pStart->GetNode() );
for( ; aIdx.GetIndex() <= nEndNd; ++aIdx )
{
SwTextNode* pAffectedNode = aIdx.GetNode().GetTextNode();
@@ -3184,7 +3184,7 @@ void DocumentContentOperationsManager::TransliterateText(
// iterate over all affected text nodes, the first and the last one
// may be incomplete because the selection starts and/or ends there
- SwNodeIndex aIdx( pStt->GetNode() );
+ SwNodeIndex aIdx( pStart->GetNode() );
if( nSttCnt )
{
++aIdx;
@@ -3226,7 +3226,7 @@ void DocumentContentOperationsManager::TransliterateText(
m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()) )
{
*pWrtShell->GetCursor()->GetMark() =
*pWrtShell->GetCursor()->End();
-
pWrtShell->GetCursor()->GetPoint()->Assign(*pStt->GetContentNode(), nSttCnt);
+
pWrtShell->GetCursor()->GetPoint()->Assign(*pStart->GetContentNode(), nSttCnt);
}
}
@@ -4508,10 +4508,10 @@ bool
DocumentContentOperationsManager::DeleteRangeImpl(SwPaM & rPam, SwDeleteFla
bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam,
SwDeleteFlags const flags)
{
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
if (!rPam.HasMark()
- || (*pStt == *pEnd && !IsFlySelectedByCursor(m_rDoc, *pStt, *pEnd)))
+ || (*pStart == *pEnd && !IsFlySelectedByCursor(m_rDoc, *pStart,
*pEnd)))
{
return false;
}
@@ -4519,9 +4519,9 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
if( m_rDoc.GetAutoCorrExceptWord() )
{
// if necessary the saved Word for the exception
- if( m_rDoc.GetAutoCorrExceptWord()->IsDeleted() || pStt->GetNode() !=
pEnd->GetNode() ||
- pStt->GetContentIndex() + 1 != pEnd->GetContentIndex() ||
- !m_rDoc.GetAutoCorrExceptWord()->CheckDelChar( *pStt ))
+ if( m_rDoc.GetAutoCorrExceptWord()->IsDeleted() || pStart->GetNode()
!= pEnd->GetNode() ||
+ pStart->GetContentIndex() + 1 != pEnd->GetContentIndex() ||
+ !m_rDoc.GetAutoCorrExceptWord()->CheckDelChar( *pStart ))
{ m_rDoc.DeleteAutoCorrExceptWord(); }
}
@@ -4589,14 +4589,14 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
rPam.GetMark()->GetContentIndex(),
rPam.GetPoint()->GetContentIndex());
}
DelBookmarks(
- pStt->GetNode(),
+ pStart->GetNode(),
pEnd->GetNode(),
nullptr,
- pStt->GetContentIndex(),
+ pStart->GetContentIndex(),
pEnd->GetContentIndex(),
bool(flags & SwDeleteFlags::ArtificialSelection));
- SwNodeIndex aSttIdx( pStt->GetNode() );
+ SwNodeIndex aSttIdx( pStart->GetNode() );
SwContentNode * pCNd = aSttIdx.GetNode().GetContentNode();
do { // middle checked loop!
@@ -4606,15 +4606,15 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
if ( pStartTextNode )
{
// now move the Content to the new Node
- bool bOneNd = pStt->GetNode() == pEnd->GetNode();
+ bool bOneNd = pStart->GetNode() == pEnd->GetNode();
const sal_Int32 nLen = ( bOneNd ? pEnd->GetContentIndex()
: pCNd->Len() )
- - pStt->GetContentIndex();
+ - pStart->GetContentIndex();
// Don't call again, if already empty
if( nLen )
{
- pStartTextNode->EraseText( *pStt, nLen );
+ pStartTextNode->EraseText( *pStart, nLen );
if( !pStartTextNode->Len() )
{
@@ -4632,7 +4632,7 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
{
// So that there are no indices left registered when deleted,
// we remove a SwPaM from the Content here.
- pStt->nContent.Assign( nullptr, 0 );
+ pStart->nContent.Assign( nullptr, 0 );
}
}
@@ -4689,13 +4689,13 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam, SwDelet
// If the Node that contained the Cursor has been deleted,
// the Content has to be assigned to the current Content.
- if (pStt->GetNode().GetContentNode())
- pStt->SetContent( pStt->GetContentIndex() );
+ if (pStart->GetNode().GetContentNode())
+ pStart->SetContent( pStart->GetContentIndex() );
// If we deleted across Node boundaries we have to correct the PaM,
// because they are in different Nodes now.
// Also, the Selection is revoked.
- *pEnd = *pStt;
+ *pEnd = *pStart;
rPam.DeleteMark();
} while( false );
@@ -4723,13 +4723,13 @@ bool
DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
SwPaM aDelPam( *rPam.GetMark(), *rPam.GetPoint() );
::PaMCorrAbs( aDelPam, *aDelPam.End() );
- auto [pStt, pEnd] = aDelPam.StartEnd(); // SwPosition*
- bool bOneNode = pStt->GetNode() == pEnd->GetNode();
+ auto [pStart, pEnd] = aDelPam.StartEnd(); // SwPosition*
+ bool bOneNode = pStart->GetNode() == pEnd->GetNode();
// Own Undo?
OUString sRepl( rStr );
- SwTextNode* pTextNd = pStt->GetNode().GetTextNode();
- sal_Int32 nStt = pStt->GetContentIndex();
+ SwTextNode* pTextNd = pStart->GetNode().GetTextNode();
+ sal_Int32 nStt = pStart->GetContentIndex();
sal_Int32 nEnd;
SwDataChanged aTmp( aDelPam );
@@ -4758,9 +4758,9 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
if(pBkmk->IsExpanded())
*aDelPam.GetMark() = pBkmk->GetOtherMarkPos();
m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
- pStt = aDelPam.Start();
- pTextNd = pStt->GetNode().GetTextNode();
- nStt = pStt->GetContentIndex();
+ pStart = aDelPam.Start();
+ pTextNd = pStart->GetNode().GetTextNode();
+ nStt = pStart->GetContentIndex();
}
if( !sRepl.isEmpty() )
@@ -4868,8 +4868,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
}
else
{
- assert((pStt->GetNode() == pEnd->GetNode() ||
- ( pStt->GetNodeIndex() + 1 == pEnd->GetNodeIndex() &&
+ assert((pStart->GetNode() == pEnd->GetNode() ||
+ ( pStart->GetNodeIndex() + 1 == pEnd->GetNodeIndex() &&
!pEnd->GetContentIndex() )) &&
"invalid range: Point and Mark on different nodes" );
@@ -4885,11 +4885,11 @@ bool
DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
}
::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo());
- if( aDelPam.GetPoint() != pStt )
+ if( aDelPam.GetPoint() != pStart )
aDelPam.Exchange();
- SwNodeIndex aPtNd( pStt->GetNode(), -1 );
- const sal_Int32 nPtCnt = pStt->GetContentIndex();
+ SwNodeIndex aPtNd( pStart->GetNode(), -1 );
+ const sal_Int32 nPtCnt = pStart->GetContentIndex();
// Set the values again, if Frames or footnotes on the Text have
been removed.
nStt = nPtCnt;
@@ -4906,9 +4906,9 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
}
else if( nStt < nEnd || !sIns.isEmpty() )
{
- pTextNd->ReplaceText( *pStt, nEnd - nStt, sIns );
+ pTextNd->ReplaceText( *pStart, nEnd - nStt, sIns );
}
- SplitNode( *pStt, false);
+ SplitNode( *pStart, false);
bFirst = false;
}
@@ -4920,7 +4920,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
}
else if( nStt < nEnd || !sIns.isEmpty() )
{
- pTextNd->ReplaceText( *pStt, nEnd - nStt, sIns );
+ pTextNd->ReplaceText( *pStart, nEnd - nStt, sIns );
}
}
@@ -4934,7 +4934,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
// move so that SetEnd remembers position after sw_JoinText
rPam.Move(fnMoveBackward);
}
- else if (aDelPam.GetPoint() == pStt) // backward selection?
+ else if (aDelPam.GetPoint() == pStart) // backward selection?
{
assert(*rPam.GetMark() <= *rPam.GetPoint());
rPam.Exchange(); // swap so that rPam is backwards
@@ -5108,13 +5108,13 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
SwDoc& rDoc = rPos.GetNode().GetDoc();
const bool bColumnSel = rDoc.IsClipBoard() && rDoc.IsColumnSelection();
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
// Catch when there's no copy to do.
- if (!rPam.HasMark() || (IsEmptyRange(*pStt, *pEnd, flags) && !bColumnSel)
||
+ if (!rPam.HasMark() || (IsEmptyRange(*pStart, *pEnd, flags) &&
!bColumnSel) ||
//JP 29.6.2001: 88963 - don't copy if inspos is in region of start to
end
//JP 15.11.2001: don't test inclusive the end, ever exclusive
- ( &rDoc == &m_rDoc && *pStt <= rPos && rPos < *pEnd ))
+ ( &rDoc == &m_rDoc && *pStart <= rPos && rPos < *pEnd ))
{
return false;
}
@@ -5153,7 +5153,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
// Note this doesn't just check IsStartNode() because SwDoc::AppendDoc()
// intentionally sets it to the body start node, perhaps it should just
// call SplitNode instead?
- if ((!pStt->GetNode().IsSectionNode() && !pStt->GetNode().IsTableNode())
+ if ((!pStart->GetNode().IsSectionNode() &&
!pStart->GetNode().IsTableNode())
|| (pCopyPam->GetPoint()->GetContentIndex() != 0 // also if node will
split
&& pCopyPam->GetPoint()->GetContentIndex() !=
pCopyPam->GetPoint()->GetNode().GetContentNode()->Len()))
{
@@ -5165,11 +5165,11 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
assert(pCopyPam->GetPoint()->GetContentIndex() == 0);
}
- SwNodeRange aRg( pStt->GetNode(), pEnd->GetNode() );
+ SwNodeRange aRg( pStart->GetNode(), pEnd->GetNode() );
SwNodeIndex aInsPos( rPos.GetNode() );
::std::optional<SwContentIndex> oInsContentIndex;
- const bool bOneNode = pStt->GetNode() == pEnd->GetNode();
- SwTextNode* pSttTextNd = pStt->GetNode().GetTextNode();
+ const bool bOneNode = pStart->GetNode() == pEnd->GetNode();
+ SwTextNode* pSttTextNd = pStart->GetNode().GetTextNode();
SwTextNode* pEndTextNd = pEnd->GetNode().GetTextNode();
SwTextNode* pDestTextNd = aInsPos.GetNode().GetTextNode();
bool bCopyCollFormat = !rDoc.IsInsOnlyTextGlossary() &&
@@ -5225,13 +5225,13 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
{
++nDeleteTextNodes; // must be joined in Undo
// Don't copy the beginning completely?
- if( !bCopyCollFormat || bColumnSel || pStt->GetContentIndex() )
+ if( !bCopyCollFormat || bColumnSel || pStart->GetContentIndex() )
{
SwContentIndex aDestIdx( rPos.GetContentNode(),
rPos.GetContentIndex() );
bool bCopyOk = false;
if( !pDestTextNd )
{
- if( pStt->GetContentIndex() || bOneNode )
+ if( pStart->GetContentIndex() || bOneNode )
pDestTextNd = rDoc.GetNodes().MakeTextNode(
aInsPos.GetNode(),
rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
else
@@ -5288,8 +5288,8 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
const sal_Int32 nCpyLen = ( bOneNode
? pEnd->GetContentIndex()
: pSttTextNd->GetText().getLength())
- - pStt->GetContentIndex();
- pSttTextNd->CopyText( pDestTextNd, aDestIdx, *pStt,
nCpyLen );
+ - pStart->GetContentIndex();
+ pSttTextNd->CopyText( pDestTextNd, aDestIdx, *pStart,
nCpyLen );
if( bEndEqualIns )
pEnd->AdjustContent( -nCpyLen );
}
@@ -5419,7 +5419,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
if( aInsPos == pEnd->GetNode() )
{
SwNodeIndex aSaveIdx( aInsPos, -1 );
- assert(pStt->GetNode() != pEnd->GetNode());
+ assert(pStart->GetNode() != pEnd->GetNode());
pEnd->SetContent(0); // TODO why this?
CopyWithFlyInFly(aRg, aInsPos.GetNode(), &tmp,
/*bMakeNewFrames*/true, false, /*bCopyFlyAtFly=*/false, flags);
++aSaveIdx;
@@ -5514,7 +5514,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
// tdf#39400 and tdf#97526
// when copy from document to ClipBoard, and it is from the first page
// and not the source has the page break
- if (rDoc.IsClipBoard() && (rPam.GetPageNum(pStt == rPam.GetPoint()) == 1)
&& !bCopyPageSource)
+ if (rDoc.IsClipBoard() && (rPam.GetPageNum(pStart == rPam.GetPoint()) ==
1) && !bCopyPageSource)
{
if (pDestTextNd)
{
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 7a15b19c47c1..90c11ed7f9a9 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -957,8 +957,8 @@ namespace
{
// handle paragraph formatting changes
// (range is only a full paragraph or a part of it)
- const SwPosition* pStt = pRedl->Start();
- SwTextNode* pTNd = pStt->GetNode().GetTextNode();
+ const SwPosition* pStart = pRedl->Start();
+ SwTextNode* pTNd = pStart->GetNode().GetTextNode();
if( pTNd )
{
// expand range to the whole paragraph
@@ -1023,14 +1023,14 @@ namespace
SwRedlineTable::size_type n = 0;
int nCount = 0;
- const SwPosition* pStt = rPam.Start(),
+ const SwPosition* pStart = rPam.Start(),
* pEnd = rPam.End();
- const SwRangeRedline* pFnd = rArr.FindAtPosition( *pStt, n );
+ const SwRangeRedline* pFnd = rArr.FindAtPosition( *pStart, n );
if( pFnd && // Is new a part of it?
- ( *pFnd->Start() != *pStt || *pFnd->End() > *pEnd ))
+ ( *pFnd->Start() != *pStart || *pFnd->End() > *pEnd ))
{
// Only revoke the partial selection
- if( (*fn_AcceptReject)( rArr, n, bCallDelete, pStt, pEnd ))
+ if( (*fn_AcceptReject)( rArr, n, bCallDelete, pStart, pEnd ))
nCount++;
++n;
}
@@ -1060,7 +1060,7 @@ namespace
{
// Only revoke the partial selection
if( (m > 0 || RedlineType::ParagraphFormat ==
pTmp->GetType()) &&
- (*fn_AcceptReject)( rArr, o, bCallDelete,
pStt, pEnd ))
+ (*fn_AcceptReject)( rArr, o, bCallDelete,
pStart, pEnd ))
{
bHasParagraphFormatChange = true;
nCount++;
@@ -1079,18 +1079,18 @@ namespace
// The Selection is only in the ContentSection. If there are Redlines
// to Non-ContentNodes before or after that, then the Selections
// expand to them.
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
SwDoc& rDoc = rPam.GetDoc();
- if( !pStt->GetContentIndex() &&
- !rDoc.GetNodes()[ pStt->GetNodeIndex() - 1 ]->IsContentNode() )
+ if( !pStart->GetContentIndex() &&
+ !rDoc.GetNodes()[ pStart->GetNodeIndex() - 1 ]->IsContentNode() )
{
- const SwRangeRedline* pRedl =
rDoc.getIDocumentRedlineAccess().GetRedline( *pStt, nullptr );
+ const SwRangeRedline* pRedl =
rDoc.getIDocumentRedlineAccess().GetRedline( *pStart, nullptr );
if( pRedl )
{
const SwPosition* pRStt = pRedl->Start();
if( !pRStt->GetContentIndex() && pRStt->GetNodeIndex() ==
- pStt->GetNodeIndex() - 1 )
- *pStt = *pRStt;
+ pStart->GetNodeIndex() - 1 )
+ *pStart = *pRStt;
}
}
if( pEnd->GetNode().IsContentNode() &&
@@ -1353,23 +1353,23 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
}
- auto [pStt, pEnd] = pNewRedl->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pNewRedl->StartEnd(); // SwPosition*
{
- SwTextNode* pTextNode = pStt->GetNode().GetTextNode();
+ SwTextNode* pTextNode = pStart->GetNode().GetTextNode();
if( pTextNode == nullptr )
{
- if( pStt->GetContentIndex() > 0 )
+ if( pStart->GetContentIndex() > 0 )
{
OSL_ENSURE( false, "Redline start: non-text-node with content"
);
- pStt->SetContent( 0 );
+ pStart->SetContent( 0 );
}
}
else
{
- if( pStt->GetContentIndex() > pTextNode->Len() )
+ if( pStart->GetContentIndex() > pTextNode->Len() )
{
OSL_ENSURE( false, "Redline start: index after text" );
- pStt->SetContent( pTextNode->Len() );
+ pStart->SetContent( pTextNode->Len() );
}
}
pTextNode = pEnd->GetNode().GetTextNode();
@@ -1390,7 +1390,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
}
}
- if( ( *pStt == *pEnd ) &&
+ if( ( *pStart == *pEnd ) &&
( pNewRedl->GetContentIdx() == nullptr ) )
{ // Do not insert empty redlines
delete pNewRedl;
@@ -1399,7 +1399,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
bool bCompress = false;
SwRedlineTable::size_type n = 0;
// look up the first Redline for the starting position
- if( !GetRedline( *pStt, &n ) && n > 0 )
+ if( !GetRedline( *pStart, &n ) && n > 0 )
--n;
const SwRedlineTable::size_type nStartPos = n;
bool bDec = false;
@@ -1419,7 +1419,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
continue;
}
- SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRStt,
*pREnd );
+ SwComparePosition eCmpPos = ComparePosition( *pStart, *pEnd, *pRStt,
*pREnd );
if ( SwComparePosition::Before == eCmpPos && !IsPrevPos( *pEnd, *pRStt
))
break;
@@ -1439,7 +1439,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// Merge if applicable?
if( (( SwComparePosition::Behind == eCmpPos &&
- IsPrevPos( *pREnd, *pStt ) ) ||
+ IsPrevPos( *pREnd, *pStart ) ) ||
( SwComparePosition::CollideStart == eCmpPos ) ||
( SwComparePosition::OverlapBehind == eCmpPos ) ) &&
pRedl->CanCombine( *pNewRedl ) &&
@@ -1466,7 +1466,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
( !n ||
*maRedlineTable[ n-1 ]->End() != *pRStt ))
{
- pRedl->SetStart( *pStt, pRStt );
+ pRedl->SetStart( *pStart, pRStt );
// re-insert
maRedlineTable.Remove( n );
maRedlineTable.Insert( pRedl );
@@ -1483,15 +1483,15 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
else if( SwComparePosition::OverlapBehind == eCmpPos )
{
- *pStt = *pREnd;
- if( ( *pStt == *pEnd ) &&
+ *pStart = *pREnd;
+ if( ( *pStart == *pEnd ) &&
( pNewRedl->GetContentIdx() == nullptr ) )
bDelete = bMaybeNotify = true;
}
else if( SwComparePosition::OverlapBefore == eCmpPos )
{
*pEnd = *pRStt;
- if( ( *pStt == *pEnd ) &&
+ if( ( *pStart == *pEnd ) &&
( pNewRedl->GetContentIdx() == nullptr ) )
bDelete = bMaybeNotify = true;
}
@@ -1526,8 +1526,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pCpy->SetStart( *pEnd );
maRedlineTable.Insert( pCpy );
}
- pRedl->SetEnd( *pStt, pREnd );
- if( ( *pStt == *pRStt ) &&
+ pRedl->SetEnd( *pStart, pREnd );
+ if( ( *pStart == *pRStt ) &&
( pRedl->GetContentIdx() == nullptr ) )
{
maRedlineTable.DeleteAndDestroy( n );
@@ -1551,7 +1551,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pSplit->SetEnd( *pRStt );
pNewRedl->SetStart( *pREnd );
maRedlineTable.Insert( pSplit );
- if( *pStt == *pEnd && pNewRedl->GetContentIdx() == nullptr
)
+ if( *pStart == *pEnd && pNewRedl->GetContentIdx() ==
nullptr )
{
delete pNewRedl;
pNewRedl = nullptr;
@@ -1567,7 +1567,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
// handle overlapping redlines in broken documents
*pEnd = *pRStt;
- if( ( *pStt == *pEnd ) &&
+ if( ( *pStart == *pEnd ) &&
( pNewRedl->GetContentIdx() == nullptr ) )
{
delete pNewRedl;
@@ -1588,8 +1588,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pCpy->SetStart( *pEnd );
maRedlineTable.Insert( pCpy );
}
- pRedl->SetEnd( *pStt, pREnd );
- if( ( *pStt == *pRStt ) &&
+ pRedl->SetEnd( *pStart, pREnd );
+ if( ( *pStart == *pRStt ) &&
( pRedl->GetContentIdx() == nullptr ) )
{
maRedlineTable.DeleteAndDestroy( n );
@@ -1613,7 +1613,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pSplit->SetEnd( *pRStt );
pNewRedl->SetStart( *pREnd );
maRedlineTable.Insert( pSplit );
- if( *pStt == *pEnd && pNewRedl->GetContentIdx() == nullptr
)
+ if( *pStart == *pEnd && pNewRedl->GetContentIdx() ==
nullptr )
{
delete pNewRedl;
pNewRedl = nullptr;
@@ -1644,8 +1644,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
break;
case SwComparePosition::OverlapBehind:
- pRedl->SetEnd( *pStt, pREnd );
- if( *pStt == *pRStt && pRedl->GetContentIdx() == nullptr )
+ pRedl->SetEnd( *pStart, pREnd );
+ if( *pStart == *pRStt && pRedl->GetContentIdx() == nullptr
)
{
maRedlineTable.DeleteAndDestroy( n );
bDec = true;
@@ -1669,8 +1669,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
SwRangeRedline* pNew = new SwRangeRedline( *pRedl
);
pNew->SetStart( *pEnd );
- pRedl->SetEnd( *pStt, pREnd );
- if( *pStt == *pRStt && pRedl->GetContentIdx() ==
nullptr )
+ pRedl->SetEnd( *pStart, pREnd );
+ if( *pStart == *pRStt && pRedl->GetContentIdx() ==
nullptr )
maRedlineTable.DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
n = 0; // re-initialize
@@ -1678,7 +1678,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
}
else
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
break;
default:
break;
@@ -1703,9 +1703,9 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
pNewRedl->SetEnd(*pRStt, pEnd);
}
- else if (*pStt == *pRStt)
+ else if (*pStart == *pRStt)
{
- pNewRedl->SetStart(*pREnd, pStt);
+ pNewRedl->SetStart(*pREnd, pStart);
}
else
{
@@ -1736,14 +1736,14 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// If that's the case we can merge it, meaning
// the new one covers this well
if( SwComparePosition::OverlapBehind == eCmpPos )
- pNewRedl->SetStart( *pRStt, pStt );
+ pNewRedl->SetStart( *pRStt, pStart );
else
pNewRedl->SetEnd( *pREnd, pEnd );
maRedlineTable.DeleteAndDestroy( n );
bDec = true;
}
else if( SwComparePosition::OverlapBehind == eCmpPos )
- pNewRedl->SetStart( *pREnd, pStt );
+ pNewRedl->SetStart( *pREnd, pStart );
else
pNewRedl->SetEnd( *pRStt, pEnd );
break;
@@ -1774,7 +1774,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// If that's the case we can merge it, meaning
// the new one covers this well
if( SwComparePosition::CollideStart == eCmpPos )
- pNewRedl->SetStart( *pRStt, pStt );
+ pNewRedl->SetStart( *pRStt, pStart );
else
pNewRedl->SetEnd( *pREnd, pEnd );
@@ -1845,7 +1845,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// For this case, we completely delete the
// paragraphs (if, of course, we also start on
// a paragraph boundary).
- if( (pStt->GetContentIndex() == 0) &&
+ if( (pStart->GetContentIndex() == 0) &&
pEnd->GetNode().IsEndNode() )
{
pEnd->Adjust(SwNodeOffset(-1));
@@ -1903,15 +1903,15 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
case SwComparePosition::OverlapBehind:
{
- SwPaM aPam( *pStt, *pREnd );
+ SwPaM aPam( *pStart, *pREnd );
- if( *pStt == *pRStt )
+ if( *pStart == *pRStt )
{
maRedlineTable.DeleteAndDestroy( n );
bDec = true;
}
else
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
if( bCallDelete )
{
@@ -1959,11 +1959,11 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
case SwComparePosition::Inside:
{
- if( *pRStt == *pStt )
+ if( *pRStt == *pStart )
{
// #i97421#
// redline w/out extent loops
- if (*pStt != *pEnd)
+ if (*pStart != *pEnd)
{
pNewRedl->PushData( *pRedl, false );
pRedl->SetStart( *pEnd, pRStt );
@@ -1981,7 +1981,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pNew = new SwRangeRedline( *pRedl );
pNew->SetStart( *pEnd );
}
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
if( !pRedl->HasValidRange() )
{
// re-insert
@@ -1999,15 +1999,15 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
pNewRedl->SetEnd( *pRStt, pEnd );
}
- else if (*pStt == *pRStt)
+ else if (*pStart == *pRStt)
{
- pNewRedl->SetStart(*pREnd, pStt);
+ pNewRedl->SetStart(*pREnd, pStart);
}
else
{
pNew = new SwRangeRedline( *pNewRedl );
pNew->SetEnd( *pRStt );
- pNewRedl->SetStart( *pREnd, pStt );
+ pNewRedl->SetStart( *pREnd, pStart );
}
bCompress = true;
}
@@ -2043,10 +2043,10 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
case SwComparePosition::OverlapBehind:
{
- if( *pStt == *pRStt )
+ if( *pStart == *pRStt )
{
pRedl->PushData( *pNewRedl );
- pNewRedl->SetStart( *pREnd, pStt );
+ pNewRedl->SetStart( *pREnd, pStart );
if( IsHideChanges( meRedlineFlags ))
{
maRedlineTable.Insert( pNewRedl );
@@ -2058,8 +2058,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
pNew = new SwRangeRedline( *pRedl );
pNew->PushData( *pNewRedl );
- pNew->SetStart( *pStt );
- pNewRedl->SetStart( *pREnd, pStt );
+ pNew->SetStart( *pStart );
+ pNewRedl->SetStart( *pREnd, pStart );
pRedl->SetEnd( *pNew->Start(), pREnd );
if( !pRedl->HasValidRange() )
{
@@ -2104,7 +2104,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
break;
case SwComparePosition::OverlapBehind:
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
break;
case SwComparePosition::Equal:
@@ -2124,8 +2124,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
SwRangeRedline* pNew = new SwRangeRedline( *pRedl
);
pNew->SetStart( *pEnd );
- pRedl->SetEnd( *pStt, pREnd );
- if( ( *pStt == *pRStt ) &&
+ pRedl->SetEnd( *pStart, pREnd );
+ if( ( *pStart == *pRStt ) &&
( pRedl->GetContentIdx() == nullptr ) )
maRedlineTable.DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
@@ -2134,7 +2134,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
}
else
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
break;
default:
break;
@@ -2157,7 +2157,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
break;
case SwComparePosition::OverlapBehind:
- pNewRedl->SetStart( *pREnd, pStt );
+ pNewRedl->SetStart( *pREnd, pStart );
break;
case SwComparePosition::Equal:
@@ -2175,9 +2175,9 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
pNewRedl->SetEnd(*pRStt, pEnd);
}
- else if (*pStt == *pRStt)
+ else if (*pStart == *pRStt)
{
- pNewRedl->SetStart(*pREnd, pStt);
+ pNewRedl->SetStart(*pREnd, pStart);
}
else
{
@@ -2218,8 +2218,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
else if( *pREnd == *pEnd )
// or else only shorten the current one
- pRedl->SetEnd( *pStt, pREnd );
- else if( *pRStt == *pStt )
+ pRedl->SetEnd( *pStart, pREnd );
+ else if( *pRStt == *pStart )
{
// or else only shorten the current one
pRedl->SetStart( *pEnd, pRStt );
@@ -2234,7 +2234,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// we need to split it
SwRangeRedline* pNew = new SwRangeRedline( *pRedl );
pNew->SetStart( *pEnd );
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
AppendRedline( pNew, bCallDelete );
n = 0; // re-initialize
bDec = true;
@@ -2249,14 +2249,14 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// If that's the case we can merge it, meaning
// the new one covers this well
if( SwComparePosition::OverlapBehind == eCmpPos )
- pNewRedl->SetStart( *pRStt, pStt );
+ pNewRedl->SetStart( *pRStt, pStart );
else
pNewRedl->SetEnd( *pREnd, pEnd );
maRedlineTable.DeleteAndDestroy( n );
bDec = false;
}
else if( SwComparePosition::OverlapBehind == eCmpPos )
- pNewRedl->SetStart( *pREnd, pStt );
+ pNewRedl->SetStart( *pREnd, pStart );
else
pNewRedl->SetEnd( *pRStt, pEnd );
break;
@@ -2264,7 +2264,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
case SwComparePosition::CollideEnd:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
pRedl->CanCombine( *pNewRedl ) &&
- (n == 0 || *maRedlineTable[ n-1 ]->End() < *pStt))
+ (n == 0 || *maRedlineTable[ n-1 ]->End() < *pStart))
{
// If that's the case we can merge it, meaning
// the new one covers this well
@@ -2282,7 +2282,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
// If that's the case we can merge it, meaning
// the new one covers this well
- pNewRedl->SetStart( *pRStt, pStt );
+ pNewRedl->SetStart( *pRStt, pStart );
maRedlineTable.DeleteAndDestroy( n );
bDec = true;
}
@@ -2307,7 +2307,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
if( pNewRedl )
{
- if( ( *pStt == *pEnd ) &&
+ if( ( *pStart == *pEnd ) &&
( pNewRedl->GetContentIdx() == nullptr ) )
{ // Do not insert empty redlines
delete pNewRedl;
@@ -2317,7 +2317,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
{
if ( bCallDelete && RedlineType::Delete == pNewRedl->GetType() )
{
- if ( pStt->GetContentIndex() != 0 )
+ if ( pStart->GetContentIndex() != 0 )
{
// tdf#119571 update the style of the joined paragraph
// after a partially deleted paragraph to show its correct
style
@@ -2326,7 +2326,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// to avoid text insertion with bad style in the deleted
// area later (except paragraphs of the removed tables).
- SwContentNode* pDelNd = pStt->GetNode().GetContentNode();
+ SwContentNode* pDelNd = pStart->GetNode().GetContentNode();
// start copying the style of the first paragraph from the
end of the range
SwContentNode* pTextNd = pEnd->GetNode().GetContentNode();
SwNodeIndex aIdx( pEnd->GetNode() );
@@ -2348,7 +2348,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
pNewRedl->SetEnd( aPos );
// get extradata for reset formatting of the
modified paragraph
- std::unique_ptr<SwRedlineExtraData_FormatColl>
pExtraData = lcl_CopyStyle(aPos, *pStt, false);
+ std::unique_ptr<SwRedlineExtraData_FormatColl>
pExtraData = lcl_CopyStyle(aPos, *pStart, false);
if (pExtraData)
{
if (!bFirst)
@@ -2365,7 +2365,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
}
// modify paragraph formatting
- lcl_CopyStyle(*pStt, aPos);
+ lcl_CopyStyle(*pStart, aPos);
}
if (bFirst)
@@ -2413,7 +2413,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
// this doesn't work for selections with multiple tables
if ( m_rDoc.GetIDocumentUndoRedo().DoesUndo() )
{
- SwNodeIndex aSttIdx( pStt->GetNode() );
+ SwNodeIndex aSttIdx( pStart->GetNode() );
SwNodeIndex aEndIdx( pEnd->GetNode() );
while ( aSttIdx < aEndIdx )
{
@@ -2594,22 +2594,22 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM&
rRange )
{
if (maRedlineTable.empty())
return false;
- auto [pStt, pEnd] = rRange.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rRange.StartEnd(); // SwPosition*
// tdf#144208 this happens a lot during load of some DOCX files.
if (*pEnd > maRedlineTable.GetMaxEndPos())
return false;
bool bChg = false;
SwRedlineTable::size_type n = 0;
- //FIXME overlapping problem GetRedline( *pStt, &n );
+ //FIXME overlapping problem GetRedline( *pStart, &n );
while (n < maRedlineTable.size())
{
SwRangeRedline * pRedline = maRedlineTable[ n ];
auto [pRedlineStart, pRedlineEnd] = pRedline->StartEnd();
- if (*pRedlineStart <= *pStt && *pEnd <= *pRedlineEnd)
+ if (*pRedlineStart <= *pStart && *pEnd <= *pRedlineEnd)
{
bChg = true;
int nn = 0;
- if (*pStt == *pRedlineStart)
+ if (*pStart == *pRedlineStart)
nn += 1;
if (*pEnd == *pRedlineEnd)
nn += 2;
@@ -2619,7 +2619,7 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM&
rRange )
{
case 0:
pNew = new SwRangeRedline( *pRedline );
- pRedline->SetEnd( *pStt, pRedlineEnd );
+ pRedline->SetEnd( *pStart, pRedlineEnd );
pNew->SetStart( *pEnd );
break;
@@ -2628,7 +2628,7 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM&
rRange )
break;
case 2:
- *pRedlineEnd = *pStt;
+ *pRedlineEnd = *pStart;
break;
case 3:
@@ -2679,9 +2679,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
}
}
- auto [pStt, pEnd] = rRange.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rRange.StartEnd(); // SwPosition*
SwRedlineTable::size_type n = 0;
- GetRedline( *pStt, &n );
+ GetRedline( *pStart, &n );
while (n < maRedlineTable.size())
{
SwRangeRedline* pRedl = maRedlineTable[ n ];
@@ -2692,7 +2692,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
}
auto [pRStt, pREnd] = pRedl->StartEnd(); // SwPosition*
- switch( ComparePosition( *pStt, *pEnd, *pRStt, *pREnd ) )
+ switch( ComparePosition( *pStart, *pEnd, *pRStt, *pREnd ) )
{
case SwComparePosition::Equal:
case SwComparePosition::Outside:
@@ -2712,7 +2712,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
case SwComparePosition::OverlapBehind:
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Remove);
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
if( !pRedl->HasValidRange() )
{
@@ -2728,7 +2728,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
{
// this one needs to be split
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Remove);
- if( *pRStt == *pStt )
+ if( *pRStt == *pStart )
{
pRedl->SetStart( *pEnd, pRStt );
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
@@ -2747,7 +2747,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
}
else
pCpy = nullptr;
- pRedl->SetEnd( *pStt, pREnd );
+ pRedl->SetEnd( *pStart, pREnd );
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
if( !pRedl->HasValidRange() )
{
@@ -2937,10 +2937,10 @@ const SwRangeRedline*
DocumentRedlineManager::GetRedline( const SwPosition& rPos
{
nM = nU + ( nO - nU ) / 2;
const SwRangeRedline* pRedl = maRedlineTable[ nM ];
- auto [pStt, pEnd] = pRedl->StartEnd();
- if( pEnd == pStt
- ? *pStt == rPos
- : ( *pStt <= rPos && rPos < *pEnd ) )
+ auto [pStart, pEnd] = pRedl->StartEnd();
+ if( pEnd == pStart
+ ? *pStart == rPos
+ : ( *pStart <= rPos && rPos < *pEnd ) )
{
while( nM && rPos == *maRedlineTable[ nM - 1 ]->End() &&
rPos == *maRedlineTable[ nM - 1 ]->Start() )
@@ -3247,9 +3247,9 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM&
rPam, bool bCallDelete,
void DocumentRedlineManager::AcceptRedlineParagraphFormatting( const SwPaM
&rPam )
{
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
- const SwNodeOffset nSttIdx = pStt->GetNodeIndex();
+ const SwNodeOffset nSttIdx = pStart->GetNodeIndex();
const SwNodeOffset nEndIdx = pEnd->GetNodeIndex();
for( SwRedlineTable::size_type n = 0; n < maRedlineTable.size() ; ++n )
@@ -3705,10 +3705,10 @@ const SwRangeRedline*
DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n,
false );
if( pFnd )
{
- const SwPosition* pStt = pFnd->Start();
- if( !pStt->GetNode().IsContentNode() )
+ const SwPosition* pStart = pFnd->Start();
+ if( !pStart->GetNode().IsContentNode() )
{
- SwNodeIndex aTmp( pStt->GetNode() );
+ SwNodeIndex aTmp( pStart->GetNode() );
SwContentNode* pCNd = SwNodes::GoNextSection(&aTmp);
if( !pCNd || ( aTmp == rSttPos.GetNode() &&
!rSttPos.GetContentIndex() ))
@@ -3821,15 +3821,15 @@ const SwRangeRedline*
DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const
OUString& rS )
{
bool bRet = false;
- auto [pStt, pEnd] = rPaM.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPaM.StartEnd(); // SwPosition*
SwRedlineTable::size_type n = 0;
- if( GetRedlineTable().FindAtPosition( *pStt, n ) )
+ if( GetRedlineTable().FindAtPosition( *pStart, n ) )
{
for( ; n < maRedlineTable.size(); ++n )
{
bRet = true;
SwRangeRedline* pTmp = maRedlineTable[ n ];
- if( pStt != pEnd && *pTmp->Start() > *pEnd )
+ if( pStart != pEnd && *pTmp->Start() > *pEnd )
break;
pTmp->SetComment( rS );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 50aea4a5a20e..e88d78b332d6 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1920,9 +1920,9 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
{
SwPosition aPos( rDstNd );
- const SwPosition* pStt = rSrcRedl.Start();
+ const SwPosition* pStart = rSrcRedl.Start();
if( rDstNd.IsContentNode() )
- aPos.SetContent( pStt->GetContentIndex() );
+ aPos.SetContent( pStart->GetContentIndex() );
pDestRedl = new SwRangeRedline( rSrcRedl.GetRedlineData(), aPos );
if( RedlineType::Delete != pDestRedl->GetType() )
@@ -1933,7 +1933,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
pDestRedl->SetMark();
pDestRedl->GetPoint()->Adjust( pEnd->GetNodeIndex() -
- pStt->GetNodeIndex() );
+ pStart->GetNodeIndex() );
if( pDestRedl->GetPointContentNode() )
pDestRedl->GetPoint()->SetContent( pEnd->GetContentIndex() );
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index bf1d9d3679e6..92acd2a45fb0 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -333,8 +333,8 @@ void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool&
rJoinPrev )
if( rPam.GetPoint()->GetNode() == rPam.GetMark()->GetNode() )
return;
- auto [pStt, pEnd] = rPam.StartEnd(); // SwPosition*
- SwTextNode *pSttNd = pStt->GetNode().GetTextNode();
+ auto [pStart, pEnd] = rPam.StartEnd(); // SwPosition*
+ SwTextNode *pSttNd = pStart->GetNode().GetTextNode();
if( !pSttNd )
return;
@@ -343,14 +343,14 @@ void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool&
rJoinPrev )
if( !rJoinText )
return;
- bool bExchange = pStt == rPam.GetPoint();
- if( !pStt->GetContentIndex() &&
+ bool bExchange = pStart == rPam.GetPoint();
+ if( !pStart->GetContentIndex() &&
pEndNd->GetText().getLength() != pEnd->GetContentIndex())
bExchange = !bExchange;
if( bExchange )
rPam.Exchange();
- rJoinPrev = rPam.GetPoint() == pStt;
- OSL_ENSURE( !pStt->GetContentIndex() &&
+ rJoinPrev = rPam.GetPoint() == pStart;
+ OSL_ENSURE( !pStart->GetContentIndex() &&
pEndNd->GetText().getLength() != pEnd->GetContentIndex()
? (rPam.GetPoint()->GetNode() < rPam.GetMark()->GetNode())
: (rPam.GetPoint()->GetNode() > rPam.GetMark()->GetNode()),
@@ -832,16 +832,16 @@ void SwDoc::DeleteAutoCorrExceptWord()
void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
{
// This is a modified version of SwDoc::TransliterateText
- auto [pStt, pEnd] = rPaM.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rPaM.StartEnd(); // SwPosition*
- const SwNodeOffset nSttNd = pStt->GetNodeIndex();
+ const SwNodeOffset nSttNd = pStart->GetNodeIndex();
const SwNodeOffset nEndNd = pEnd->GetNodeIndex();
- const sal_Int32 nSttCnt = pStt->GetContentIndex();
+ const sal_Int32 nSttCnt = pStart->GetContentIndex();
const sal_Int32 nEndCnt = pEnd->GetContentIndex();
- const SwTextNode* pTNd = pStt->GetNode().GetTextNode();
- if( pStt == pEnd && pTNd ) // no region ?
+ const SwTextNode* pTNd = pStart->GetNode().GetTextNode();
+ if( pStart == pEnd && pTNd ) // no region ?
{
// do nothing
return;
@@ -849,7 +849,7 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat
)
if( nSttNd != nEndNd )
{
- SwNodeIndex aIdx( pStt->GetNode() );
+ SwNodeIndex aIdx( pStart->GetNode() );
if( nSttCnt )
{
++aIdx;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 473006ad3bb9..de03888e4380 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -237,12 +237,12 @@ void SwDoc::RstTextAttrs(const SwPaM &rRg, bool
bInclRefToxMark,
pHst = &pUndo->GetHistory();
GetIDocumentUndoRedo().AppendUndo(std::move(pUndo));
}
- auto [pStt, pEnd] = rRg.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rRg.StartEnd(); // SwPosition*
sw::DocumentContentOperationsManager::ParaRstFormat aPara(
- pStt, pEnd, pHst, nullptr, pLayout );
+ pStart, pEnd, pHst, nullptr, pLayout );
aPara.bInclRefToxMark = bInclRefToxMark;
aPara.bExactRange = bExactRange;
- GetNodes().ForEach( pStt->GetNodeIndex(), pEnd->GetNodeIndex()+1,
+ GetNodes().ForEach( pStart->GetNodeIndex(), pEnd->GetNodeIndex()+1,
sw::DocumentContentOperationsManager::lcl_RstTextAttr,
&aPara );
getIDocumentState().SetModified();
}
@@ -324,9 +324,9 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
GetIDocumentUndoRedo().AppendUndo(std::move(pUndo));
}
- auto [pStt, pEnd] = pPam->StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = pPam->StartEnd(); // SwPosition*
sw::DocumentContentOperationsManager::ParaRstFormat aPara(
- pStt, pEnd, pHst, nullptr, pLayout);
+ pStart, pEnd, pHst, nullptr, pLayout);
// mst: not including META here; it seems attrs with CH_TXTATR are omitted
SfxItemSetFixed<RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
@@ -343,9 +343,9 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
aPara.pDelSet = &aDelSet;
bool bAdd = true;
- SwNodeIndex aTmpStt( pStt->GetNode() );
+ SwNodeIndex aTmpStt( pStart->GetNode() );
SwNodeIndex aTmpEnd( pEnd->GetNode() );
- if( pStt->GetContentIndex() ) // just one part
+ if( pStart->GetContentIndex() ) // just one part
{
// set up a later, and all CharFormatAttr -> TextFormatAttr
SwTextNode* pTNd = aTmpStt.GetNode().GetTextNode();
@@ -371,7 +371,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
++aTmpEnd;
bAdd = false;
}
- else if( pStt->GetNode() != pEnd->GetNode() || !pStt->GetContentIndex() )
+ else if( pStart->GetNode() != pEnd->GetNode() ||
!pStart->GetContentIndex() )
{
SwTextNode* pTNd = aTmpEnd.GetNode().GetTextNode();
if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
@@ -389,11 +389,11 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
}
if( aTmpStt < aTmpEnd )
- GetNodes().ForEach( pStt->GetNode(), aTmpEnd.GetNode(), lcl_RstAttr,
&aPara );
+ GetNodes().ForEach( pStart->GetNode(), aTmpEnd.GetNode(), lcl_RstAttr,
&aPara );
else if( !rRg.HasMark() )
{
aPara.bResetAll = false ;
- ::lcl_RstAttr( &pStt->GetNode(), &aPara );
+ ::lcl_RstAttr( &pStart->GetNode(), &aPara );
aPara.bResetAll = true ;
}
@@ -401,7 +401,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
{
if( bAdd )
++aTmpEnd;
- GetNodes().ForEach( pStt->GetNode(), aTmpEnd.GetNode(),
sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
+ GetNodes().ForEach( pStart->GetNode(), aTmpEnd.GetNode(),
sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
}
getIDocumentState().SetModified();
@@ -1085,7 +1085,7 @@ bool SwDoc::SetTextFormatColl(const SwPaM &rRg,
SwRootFrame const*const pLayout)
{
SwDataChanged aTmp( rRg );
- auto [pStt, pEnd] = rRg.StartEnd(); // SwPosition*
+ auto [pStart, pEnd] = rRg.StartEnd(); // SwPosition*
SwHistory* pHst = nullptr;
bool bRet = true;
@@ -1100,7 +1100,7 @@ bool SwDoc::SetTextFormatColl(const SwPaM &rRg,
std::shared_ptr<SfxItemSet> pDelSet;
sw::DocumentContentOperationsManager::ParaRstFormat aPara(
- pStt, pEnd, pHst, nullptr, pLayout);
+ pStart, pEnd, pHst, nullptr, pLayout);
aPara.pFormatColl = pFormat;
aPara.bReset = bReset;
// #i62675#
@@ -1113,7 +1113,7 @@ bool SwDoc::SetTextFormatColl(const SwPaM &rRg,
aPara.pDelSet = pDelSet.get();
}
- GetNodes().ForEach( pStt->GetNodeIndex(), pEnd->GetNodeIndex()+1,
+ GetNodes().ForEach( pStart->GetNodeIndex(), pEnd->GetNodeIndex()+1,
lcl_SetTextFormatColl, &aPara );
if( !aPara.nWhich )
bRet = false; // didn't find a valid Node
-e
... etc. - the rest is truncated
