sw/source/core/doc/docbm.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 72e93e138abfe68b5591fee9c160bdb2779a523a
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon May 19 08:40:17 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon May 19 11:29:34 2025 +0200
cid#1647013 Uncaught Exception
Change-Id: I9b88f9a3bbcd2c80ba25d0d86b2adf80b5fd8024
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 5166bf389707..fa864a001a8e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -519,7 +519,8 @@ namespace sw::mark
for (auto& pMark : parent.m_vAllMarks)
usedNames.insert(pMark->GetName().toString());
}
- ~UniqueNameChecksGuard_impl() override
+
+ void ImplDestroy()
{
assert(parent.m_pUniqueNameChecksGuard == this);
for (auto& pMark : parent.m_vAllMarks)
@@ -533,6 +534,11 @@ namespace sw::mark
parent.m_pUniqueNameChecksGuard = nullptr;
}
+ ~UniqueNameChecksGuard_impl() override
+ {
+ suppress_fun_call_w_exception(ImplDestroy());
+ }
+
void add(sw::mark::MarkBase* mark) { uncheckedNameMarks.insert(mark); }
private:
