sw/source/core/crsr/findfmt.cxx | 4 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 34 ++++++++--------
2 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 867f7311c36c0ae6d8dd8b6e3f1466d6babe4817
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 29 13:56:37 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 29 16:07:21 2022 +0200
use more SwPosition::SetContent
part of the process of hiding the internals of SwPosition.
Change-Id: Ifa1996b286058bf17a29401a079ecfd4d2babd2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140735
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index d2187d8db1d6..22c84d9bfb3c 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -967,10 +967,10 @@ namespace
rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
}
- bool lcl_SaveFootnote( const SwNodeIndex& rSttNd, const SwNodeIndex&
rEndNd,
+ bool lcl_SaveFootnote( const SwNode& rSttNd, const SwNode& rEndNd,
const SwNode& rInsPos,
SwFootnoteIdxs& rFootnoteArr, SwFootnoteIdxs& rSaveArr,
- const SwContentIndex* pSttCnt = nullptr, const
SwContentIndex* pEndCnt = nullptr )
+ std::optional<sal_Int32> oSttCnt = std::nullopt,
std::optional<sal_Int32> oEndCnt = std::nullopt )
{
bool bUpdateFootnote = false;
const SwNodes& rNds = rInsPos.GetNodes();
@@ -982,7 +982,7 @@ namespace
{
size_t nPos = 0;
- rFootnoteArr.SeekEntry( rSttNd.GetNode(), &nPos );
+ rFootnoteArr.SeekEntry( rSttNd, &nPos );
SwTextFootnote* pSrch;
const SwNode* pFootnoteNd;
@@ -992,12 +992,12 @@ namespace
<= rEndNd.GetIndex() )
{
const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
- if( ( pEndCnt && pSttCnt )
- ? (( &rSttNd.GetNode() == pFootnoteNd &&
- pSttCnt->GetIndex() > nFootnoteSttIdx) ||
- ( &rEndNd.GetNode() == pFootnoteNd &&
- nFootnoteSttIdx >= pEndCnt->GetIndex() ))
- : ( &rEndNd.GetNode() == pFootnoteNd ))
+ if( ( oEndCnt && oSttCnt )
+ ? (( &rSttNd == pFootnoteNd &&
+ *oSttCnt > nFootnoteSttIdx) ||
+ ( &rEndNd == pFootnoteNd &&
+ nFootnoteSttIdx >= *oEndCnt ))
+ : ( &rEndNd == pFootnoteNd ))
{
++nPos; // continue searching
}
@@ -1025,11 +1025,11 @@ namespace
GetTextNode())->GetIndex() >= rSttNd.GetIndex() )
{
const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
- if( !pEndCnt || !pSttCnt ||
- ! (( &rSttNd.GetNode() == pFootnoteNd &&
- pSttCnt->GetIndex() > nFootnoteSttIdx ) ||
- ( &rEndNd.GetNode() == pFootnoteNd &&
- nFootnoteSttIdx >= pEndCnt->GetIndex() )) )
+ if( !oEndCnt || !oSttCnt ||
+ ! (( &rSttNd == pFootnoteNd &&
+ *oSttCnt > nFootnoteSttIdx ) ||
+ ( &rEndNd == pFootnoteNd &&
+ nFootnoteSttIdx >= *oEndCnt )) )
{
if( bDelFootnote )
{
@@ -2376,9 +2376,9 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
}
else
{
- bUpdateFootnote = lcl_SaveFootnote( pStt->nNode, pEnd->nNode,
rPos.GetNode(),
+ bUpdateFootnote = lcl_SaveFootnote( pStt->GetNode(), pEnd->GetNode(),
rPos.GetNode(),
m_rDoc.GetFootnoteIdxs(), aTmpFntIdx,
- &pStt->nContent, &pEnd->nContent );
+ pStt->GetContentIndex(),
pEnd->GetContentIndex() );
}
bool bSplit = false;
@@ -2577,7 +2577,7 @@ bool DocumentContentOperationsManager::MoveNodeRange(
SwNodeRange& rRange, SwNod
}
else
{
- bUpdateFootnote = lcl_SaveFootnote( rRange.aStart, rRange.aEnd,
rDestNd,
+ bUpdateFootnote = lcl_SaveFootnote( rRange.aStart.GetNode(),
rRange.aEnd.GetNode(), rDestNd,
m_rDoc.GetFootnoteIdxs(), aTmpFntIdx );
}
commit 16844900b94e07975888745aa6d07e60c07ff680
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 29 12:56:19 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 29 16:07:07 2022 +0200
use more SwPosition::SetContent
part of the process of hiding the internals of SwPosition
Change-Id: I46fa167cafccb57baa4f8153528d2f130a4d96a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140732
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index aa6d9b48468c..ba8ab8382804 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -78,8 +78,8 @@ bool FindFormatImpl(SwPaM & rSearchPam,
{
*rSearchPam.GetPoint() = *oPam->GetPoint();
rSearchPam.SetMark();
- pNode->MakeEndIndex( &rSearchPam.GetPoint()->nContent );
- rSearchPam.GetMark()->nContent = 0;
+ rSearchPam.GetPoint()->SetContent(pNode->Len());
+ rSearchPam.GetMark()->SetContent(0);
}
// if backward search, switch point and mark
