diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-01 14:42:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-07 07:12:39 +0100 |
| commit | 8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 (patch) | |
| tree | d41feeea533127280e0503d0dc2dd55a4ab83ce8 /toolkit | |
| parent | 4f810905fa74128871f2fe924a3d28a79f4e4261 (diff) | |
log nice exception messages whereever possible
Change-Id: Idd125c18bee1a39b9ea8cc4f8c55cddfd37c33e1
Reviewed-on: https://gerrit.libreoffice.org/68579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/tree/treecontrol.cxx | 9 | ||||
| -rw-r--r-- | toolkit/source/helper/listenermultiplexer.cxx | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 80a526d3ae20..324d456e37b0 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -97,7 +97,8 @@ struct DisposeControlModel } catch (const Exception&) { - SAL_WARN("toolkit", "caught an exception while disposing a component!" ); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("toolkit", "caught an exception while disposing a component! " << exceptionToString(ex) ); } } }; @@ -816,7 +817,8 @@ namespace } catch (const Exception&) { - SAL_WARN("toolkit", "caught an exception while determining the dialog page!" ); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("toolkit", "caught an exception while determining the dialog page! " << exceptionToString(ex) ); } return nStep; } diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 50eb1136531a..6a8c77c11941 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/implbase.hxx> #include <helper/unopropertyarrayhelper.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -466,9 +467,9 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNo if ( e.Context == xListener || !e.Context.is() ) aIt.remove(); } - catch( const RuntimeException& e ) + catch( const RuntimeException& ) { - DISPLAY_EXCEPTION( TreeEditListenerMultiplexer, nodeEditing, e ) + DISPLAY_EXCEPTION( TreeEditListenerMultiplexer, nodeEditing ) } } } @@ -489,9 +490,9 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNod if ( e.Context == xListener || !e.Context.is() ) aIt.remove(); } - catch( const RuntimeException& e ) + catch( const RuntimeException& ) { - DISPLAY_EXCEPTION( TreeEditListenerMultiplexer, nodeEdited, e ) + DISPLAY_EXCEPTION( TreeEditListenerMultiplexer, nodeEdited ) } } } diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 7083ee0ca03d..a1c4d8a53c0f 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -20,6 +20,7 @@ #include <toolkit/helper/listenermultiplexer.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/queryinterface.hxx> +#include <tools/diagnose_ex.h> // class ListenerMultiplexerBase @@ -179,9 +180,9 @@ void TabListenerMultiplexer::changed( sal_Int32 evt, const css::uno::Sequence< c if ( e.Context == xListener || !e.Context.is() ) aIt.remove(); } - catch(const css::uno::RuntimeException& e) + catch(const css::uno::RuntimeException&) { - DISPLAY_EXCEPTION( TabListenerMultiplexer, changed, e ) + DISPLAY_EXCEPTION( TabListenerMultiplexer, changed ) } } } |