diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-11-13 21:00:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-14 15:53:59 +0100 |
| commit | d9faec292239a978881c395dce2970176994a614 (patch) | |
| tree | 34aa6afe51efb2661e95fa8ffbd6f83ab8c2f2a6 | |
| parent | 29f5bad823016a5d016c3f3012e3c2dc41736303 (diff) | |
cid#1421164 Uncaught exception
Change-Id: I1268249349e4817c2ebade909b4ce8fa65365407
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125171
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 7 |
2 files changed, 8 insertions, 1 deletions
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 = |