sw/source/filter/ww8/ww8par.hxx | 2 ++
sw/source/filter/ww8/ww8par3.cxx | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d9faec292239a978881c395dce2970176994a614
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Nov 13 21:00:49 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Nov 14 15:53:59 2021 +0100
cid#1421164 Uncaught exception
Change-Id: I1268249349e4817c2ebade909b4ce8fa65365407
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125171
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index b978b08f755b..63d0e1baa1b1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -187,6 +187,8 @@ private:
WW8aCFormat& aCharFormat, bool& bNewCharFormatCreated,
const OUString& aPrefix = OUString());
+ void ImplDestroy();
+
WW8ListManager(const WW8ListManager&) = delete;
WW8ListManager& operator=(const WW8ListManager&) = delete;
sal_uInt16 nLastLFOPosition;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 900d252c9049..aab719c99d7d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1480,7 +1480,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
rSt.Seek( nOriginalPos );
}
-WW8ListManager::~WW8ListManager()
+void WW8ListManager::ImplDestroy()
{
/*
named lists remain in document
@@ -1507,6 +1507,11 @@ WW8ListManager::~WW8ListManager()
}
}
+WW8ListManager::~WW8ListManager()
+{
+ suppress_fun_call_w_exception(ImplDestroy());
+}
+
static bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
{
bool bRet =
