diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/o3tl/deleter.hxx | 4 | ||||
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx index 4dce1d005f71..4e90ca5a61f6 100644 --- a/include/o3tl/deleter.hxx +++ b/include/o3tl/deleter.hxx @@ -28,9 +28,9 @@ template<typename T> struct default_delete { delete p; } - catch (const css::uno::Exception& e) + catch (const css::uno::Exception&) { - SAL_WARN("vcl.app", "Fatal exception: " << e.Message); + SAL_WARN("vcl.app", "Fatal exception: " << exceptionToString(ex)); std::terminate(); } catch (const std::exception& e) diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index d06988b18fde..cf50d53c15be 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -103,10 +103,11 @@ void ClassName::disposing( const css::lang::EventObject& ) \ #if OSL_DEBUG_LEVEL > 0 - #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ - SAL_WARN( "toolkit", #ClassName "::" #MethodName ": caught an exception! " << e); + #define DISPLAY_EXCEPTION( ClassName, MethodName ) \ + css::uno::Any ex( cppu::getCaughtException() ); \ + SAL_WARN( "toolkit", #ClassName "::" #MethodName ": caught an exception! " << exceptionToString(ex)); #else - #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e; + #define DISPLAY_EXCEPTION( ClassName, MethodName ) #endif #define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( ClassName, InterfaceName, MethodName, ParamType1 ) \ @@ -127,9 +128,9 @@ void ClassName::disposing( const css::lang::EventObject& ) \ if ( e.Context == xListener || !e.Context.is() ) \ aIt.remove(); \ } \ - catch(const css::uno::RuntimeException& e) \ + catch(const css::uno::RuntimeException&) \ { \ - DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ + DISPLAY_EXCEPTION( ClassName, MethodName ) \ } \ } \ } @@ -153,9 +154,9 @@ void ClassName::disposing( const css::lang::EventObject& ) \ if ( e.Context == xListener || !e.Context.is() ) \ aIt.remove(); \ } \ - catch(const css::uno::RuntimeException& e) \ + catch(const css::uno::RuntimeException&) \ { \ - DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ + DISPLAY_EXCEPTION( ClassName, MethodName ) \ } \ } \ } |