[Libreoffice-commits] core.git: sd/source sw/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/drviews2.cxx |    4 +++-
 sw/source/core/undo/unsect.cxx |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 96e9eb56f0f76590ccc46a6948ae00803a92f113
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 4 17:34:40 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Dec 4 19:39:31 2021 +0100

    cid1494597 silence Uncaught exception
    
    and
    
    cid#1494595 Uncaught exception
    
    Change-Id: I2433b777c15703c441142c2102e5d71f7dfc18ab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126366
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index b951231f2c5b..afe425406e50 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -49,6 +49,8 @@
 #include <editeng/CustomPropertyField.hxx>
 #include <editeng/urlfieldhelper.hxx>
 
+#include <o3tl/deleter.hxx>
+
 #include <sal/log.hxx>
 
 #include <sfx2/bindings.hxx>
@@ -499,7 +501,7 @@ public:
         OutlinerMode eOutlinerMode = pOutliner->GetOutlinerMode();
 
         comphelper::ScopeGuard const aOutlinerGuard([pOutliner, eOutlinerMode] 
() {
-            pOutliner->Init(eOutlinerMode);
+            suppress_fun_call_w_exception(pOutliner->Init(eOutlinerMode));
         });
 
         pOutliner->Init(OutlinerMode::TextObject);
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 81255ed73cad..e93b34cfd340 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <UndoSection.hxx>
 
+#include <o3tl/deleter.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/scopeguard.hxx>
 #include <sfx2/linkmgr.hxx>
@@ -190,7 +191,7 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & 
rContext)
                 if (pLayoutToReset)
                 {
                     pLayoutToReset->SetHideRedlines(std::get<1>(*m_xTOXBase) 
== sw::RedlineMode::Shown);
-                    pLayoutToReset->SetFieldmarkMode(eFieldmarkMode);
+                    
suppress_fun_call_w_exception(pLayoutToReset->SetFieldmarkMode(eFieldmarkMode));
                 }
             });
         o3tl::sorted_vector<SwRootFrame *> layouts(rDoc.GetAllLayouts());