core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/inc/msfilter.hxx     |    2 ++
 sw/source/filter/ww8/writerhelper.cxx |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 86b75e441cf14846c4e22b6271e9b9225f9e77c6
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Feb 27 09:06:27 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Feb 27 13:41:28 2024 +0100

    cid#1592377 Uncaught exception
    
    Change-Id: I61320896ddeeabed9f21798919bac0e0fecf32e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164015
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/filter/inc/msfilter.hxx 
b/sw/source/filter/inc/msfilter.hxx
index 70ef8d12aa80..39c1c465cb16 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -303,6 +303,8 @@ namespace sw
             RedlineStack(RedlineStack const&) = delete;
             RedlineStack& operator=(RedlineStack const&) = delete;
 
+            void ImplDestroy();
+
         public:
             explicit RedlineStack(SwDoc &rDoc) : mrDoc(rDoc) {}
             void MoveAttrsFieldmarkInserted(const SwPosition& rPos);
diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 73cd0eeab8ac..5db0319e2906 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -831,12 +831,17 @@ namespace sw
                 return (pOne->m_aStamp < pTwo->m_aStamp);
         }
 
-        RedlineStack::~RedlineStack()
+        void RedlineStack::ImplDestroy()
         {
             std::stable_sort(maStack.begin(), maStack.end(), 
CompareRedlines());
             std::for_each(maStack.begin(), maStack.end(), 
SetInDocAndDelete(mrDoc));
         }
 
+        RedlineStack::~RedlineStack()
+        {
+            suppress_fun_call_w_exception(ImplDestroy());
+        }
+
         sal_uInt16 WrtRedlineAuthor::AddName( const OUString& rNm )
         {
             sal_uInt16 nRet;