diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-12-06 09:55:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-12-06 14:25:41 +0100 |
| commit | 0a710c5c4475b593428c6d90e791ef2ccc880062 (patch) | |
| tree | 72678de88bb0c696c6359ef92a61b496eae0f8f3 /include/o3tl | |
| parent | e4519a0e204928e0951bea047fd4a2644af2c615 (diff) | |
cid#1494595,1494597: Silence UNCAUGHT_EXCEPT
...after aa5ee0085c7d8b8713f4dbed0009b38b9fabb281 "Stop swallowing exceptions in
~ScopeGuard" had dropped the catch blocks from ~ScopeGuard to make it usable in
Library_salhelper in 0c1c300ed7ce168755ae945822eb7a1c610cfa25 "Rather use
ScopeGuard to prevent catch and rethrow". But using the original
suppress_fun_call_w_exception, which used css::uno::Exception, would have caused
the same circular-dependency issue again that
aa5ee0085c7d8b8713f4dbed0009b38b9fabb281 had solved, so drop the use of
css::uno::Exception (and SAL_WARN, which triggered a number of missing #include
<sal/log.hxx>) also from suppress_fun_call_w_exception. After all, that was
__COVERITY__-only code that wasn't meant to be actually run, so it shouldn't
matter if we just catch everything and silently terminate.
Change-Id: If28a214709e4636e1c23a49f2d95d87c91492f14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126404
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/deleter.hxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx index ed8b1a583094..96f9b4b49274 100644 --- a/include/o3tl/deleter.hxx +++ b/include/o3tl/deleter.hxx @@ -14,9 +14,6 @@ #include <cstdlib> -#include <com/sun/star/uno/Exception.hpp> -#include <sal/log.hxx> - #if defined(__COVERITY__) #define suppress_fun_call_w_exception(expr) \ do \ @@ -25,14 +22,8 @@ { \ expr; \ } \ - catch (const css::uno::Exception& ex) \ - { \ - SAL_WARN("vcl.app", "Fatal exception: " << exceptionToString(ex)); \ - std::terminate(); \ - } \ - catch (const std::exception& e) \ + catch (...) \ { \ - SAL_WARN("vcl.app", "Fatal exception: " << e.what()); \ std::terminate(); \ } \ } while (false) |