From 3a51daeace695ead38cfd82b3a0f1e6f25a32e0f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 May 2018 15:47:30 +0200 Subject: 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 Reviewed-by: Noel Grandin --- eventattacher/source/eventattacher.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'eventattacher') diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 758189f65307..045d9d968036 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -37,6 +37,7 @@ // InvocationToAllListenerMapper #include #include +#include #include #include #include @@ -510,9 +511,10 @@ Any SAL_CALL FilterAllListenerImpl::approveFiring( const AllEventObject& Event ) convertToEventReturn( aRet, aRetType ); } } - catch( const CannotConvertException& e ) + catch( const CannotConvertException& ) { - throw InvocationTargetException( OUString(), Reference< XInterface >(), Any(&e, cppu::UnoType::get()) ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw InvocationTargetException( OUString(), Reference< XInterface >(), anyEx ); } } return aRet; -- cgit