diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-24 15:47:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-25 21:46:49 +0200 |
| commit | 3a51daeace695ead38cfd82b3a0f1e6f25a32e0f (patch) | |
| tree | af3ef1144aef6ed62f4ab99b88d13b41bd3b3694 /forms | |
| parent | ff3bdde2527123fc9e011ff0d93e958174632186 (diff) | |
Improve re-throwing of UNO exceptions
(*) if we are already throwing a Wrapped*Exception, get the
exception using cppu::getCaughtexception.
(*) when catching and then immediately throwing UNO exceptions,
use cppu::getCaughtException to prevent exception slicing
(*) if we are going to catch an exception and then
immediately throw a RuntimeException, rather throw a
WrappedTargetRuntimeException and preserve the original exception information.
Change-Id: Ia7a501a50ae0e6f4d05186333c8517fdcb17d558
Reviewed-on: https://gerrit.libreoffice.org/54692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/clickableimage.cxx | 6 | ||||
| -rw-r--r-- | forms/source/xforms/submission.cxx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index ab3cfe52d83b..d110b36f1524 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -43,6 +43,7 @@ #include <osl/mutex.hxx> #include <services.hxx> #include <comphelper/listenernotification.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <svtools/imageresourceaccess.hxx> #define LOCAL_URL_PREFIX '#' @@ -422,10 +423,11 @@ namespace frm // allowed to leave throw; } - catch( const Exception& e ) + catch( const Exception& ) { + css::uno::Any anyEx = cppu::getCaughtException(); OSL_FAIL( "OClickableImageBaseControl::implSubmit: caught an unknown exception!" ); - throw WrappedTargetException( OUString(), *this, makeAny( e ) ); + throw WrappedTargetException( OUString(), *this, anyEx ); } } diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 3757378c663d..08e04b8b2a33 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/task/XInteractionContinuation.hpp> #include <com/sun/star/xforms/InvalidDataOnSubmitException.hpp> #include <com/sun/star/frame/XFrame.hpp> +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/interaction.hxx> @@ -469,12 +470,13 @@ void SAL_CALL Submission::submitWithInteraction( // allowed to leave throw; } - catch( const Exception& e ) + catch( const Exception& ) { + css::uno::Any anyEx = cppu::getCaughtException(); // exception caught: re-throw as wrapped target exception throw WrappedTargetException( lcl_message( sID, " due to exception being thrown" ), - *this, makeAny( e ) ); + *this, anyEx ); } if( !bResult ) |