sw/source/uibase/shells/textfld.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 0c6599ca14ff4ff63224a7e34e93eb30e1ce2adc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Aug 5 12:56:10 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 7 12:06:10 2024 +0200
simplify bookmark name calculation
Change-Id: I19a55158b50ac8b8a66e74484d0dc4b531729de2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171566
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index 40e71b33938e..4af3042acfe3 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -1110,13 +1110,13 @@ FIELD_INSERT:
const bool bIsSinglePage = rDesc.GetFollow() != &rDesc;
const size_t nMirrorPagesNeeded = rDesc.IsFirstShared() ? 2 :
3;
const OUString sBookmarkName =
OUString::Concat("PageNumWizard_")
- + (bHeader ? "HEADER" : "FOOTER") + "_" + rDesc.GetName();
+ + (bHeader ? "HEADER" : "FOOTER") + "_" + rDesc.GetName()
+ + OUString::number(rSh.GetVirtPageNum());
IDocumentMarkAccess& rIDMA = *rSh.getIDocumentMarkAccess();
// Allow wizard to be re-run: delete previously
wizard-inserted page number.
// Try before creating non-shared header: avoid copying ODD
bookmark onto EVEN page.
- auto ppMark = rIDMA.findMark(
- sBookmarkName + OUString::number(rSh.GetVirtPageNum()));
+ auto ppMark = rIDMA.findMark(sBookmarkName);
if (ppMark != rIDMA.getAllMarksEnd() && *ppMark)
{
SwPaM aDeleteOldPageNum((*ppMark)->GetMarkStart(),
(*ppMark)->GetMarkEnd());
@@ -1307,7 +1307,7 @@ FIELD_INSERT:
// Allow wizard to be re-run: delete previously
wizard-inserted page number.
// Now that the cursor may have moved to a different page, try
delete again.
- ppMark = rIDMA.findMark(sBookmarkName +
OUString::number(rSh.GetVirtPageNum()));
+ ppMark = rIDMA.findMark(sBookmarkName);
if (ppMark != rIDMA.getAllMarksEnd() && *ppMark)
{
SwPaM aDeleteOldPageNum((*ppMark)->GetMarkStart(),
(*ppMark)->GetMarkEnd());
@@ -1373,7 +1373,7 @@ FIELD_INSERT:
assert(aNewBookmarkPaM.GetPointContentNode() && "only
SetContent on content node");
aNewBookmarkPaM.Start()->SetContent(nStartContentIndex);
rIDMA.makeMark(aNewBookmarkPaM,
- sBookmarkName +
OUString::number(rSh.GetVirtPageNum()),
+ sBookmarkName,
IDocumentMarkAccess::MarkType::BOOKMARK,
sw::mark::InsertMode::New);
@@ -1382,7 +1382,7 @@ FIELD_INSERT:
&& rSh.SetCursorInHdFt(nPageDescIndex, bHeader,
/*Even=*/true))
{
assert(nEvenPage && "what? no even page and yet we got
here?");
- ppMark = rIDMA.findMark(sBookmarkName +
OUString::number(rSh.GetVirtPageNum()));
+ ppMark = rIDMA.findMark(sBookmarkName);
if (ppMark != rIDMA.getAllMarksEnd() && *ppMark)
{
SwPaM aDeleteOldPageNum((*ppMark)->GetMarkStart(),
(*ppMark)->GetMarkEnd());
@@ -1427,7 +1427,7 @@ FIELD_INSERT:
aNewEvenBookmarkPaM.SetMark();
aNewEvenBookmarkPaM.Start()->SetContent(nStartContentIndex);
rIDMA.makeMark(aNewEvenBookmarkPaM,
- sBookmarkName +
OUString::number(rSh.GetVirtPageNum()),
+ sBookmarkName,
IDocumentMarkAccess::MarkType::BOOKMARK,
sw::mark::InsertMode::New);
}
