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 /pyuno | |
| 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 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno_adapter.cxx | 4 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index 0a18a48ae75b..1461d1adec48 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/MethodConcept.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> @@ -378,7 +379,8 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value ) } catch( const IllegalArgumentException & exc ) { - throw InvocationTargetException( exc.Message, *this, css::uno::makeAny( exc ) ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw InvocationTargetException( exc.Message, *this, anyEx ); } } diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 751c104dca04..53c7acb709b8 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/script/InvocationAdapterFactory.hpp> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <comphelper/sequence.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <vector> @@ -804,8 +805,9 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con } catch( const css::uno::Exception & e ) { + css::uno::Any anyEx = cppu::getCaughtException(); throw WrappedTargetRuntimeException( - e.Message, e.Context, makeAny(e)); + e.Message, e.Context, anyEx); } } |