diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-12-06 16:44:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-06 18:29:40 +0100 |
| commit | 478dfbd29748855512dd6ab81fd61b0cb573a27f (patch) | |
| tree | 81adb1601cf831ebb9d5fc9c1f56782c28876a4f | |
| parent | 4f41fb1cba455db617d7fb68450ea1e38ac9cb0d (diff) | |
Revert "cid1494597 silence Uncaught exception"
This reverts commit 96e9eb56f0f76590ccc46a6948ae00803a92f113, as it should no
longer be necessary with the more general
0a710c5c4475b593428c6d90e791ef2ccc880062 "cid#1494595,1494597: Silence
UNCAUGHT_EXCEPT" (which I had created without being aware that this commit
already existed).
Change-Id: Iabf20626577af251e2e5bb146ad37c2a6ed7e3e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126428
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/undo/unsect.cxx | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index afe425406e50..b951231f2c5b 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -49,8 +49,6 @@ #include <editeng/CustomPropertyField.hxx> #include <editeng/urlfieldhelper.hxx> -#include <o3tl/deleter.hxx> - #include <sal/log.hxx> #include <sfx2/bindings.hxx> @@ -501,7 +499,7 @@ public: OutlinerMode eOutlinerMode = pOutliner->GetOutlinerMode(); comphelper::ScopeGuard const aOutlinerGuard([pOutliner, eOutlinerMode] () { - suppress_fun_call_w_exception(pOutliner->Init(eOutlinerMode)); + pOutliner->Init(eOutlinerMode); }); pOutliner->Init(OutlinerMode::TextObject); diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index e93b34cfd340..81255ed73cad 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -20,7 +20,6 @@ #include <memory> #include <UndoSection.hxx> -#include <o3tl/deleter.hxx> #include <osl/diagnose.h> #include <comphelper/scopeguard.hxx> #include <sfx2/linkmgr.hxx> @@ -191,7 +190,7 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext) if (pLayoutToReset) { pLayoutToReset->SetHideRedlines(std::get<1>(*m_xTOXBase) == sw::RedlineMode::Shown); - suppress_fun_call_w_exception(pLayoutToReset->SetFieldmarkMode(eFieldmarkMode)); + pLayoutToReset->SetFieldmarkMode(eFieldmarkMode); } }); o3tl::sorted_vector<SwRootFrame *> layouts(rDoc.GetAllLayouts()); |