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 /jvmaccess | |
| 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 'jvmaccess')
| -rw-r--r-- | jvmaccess/Library_jvmaccess.mk | 1 | ||||
| -rw-r--r-- | jvmaccess/source/classpath.cxx | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 0a0fc2312e15..b4ef50a7d427 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_use_api,jvmaccess,\ $(eval $(call gb_Library_use_libraries,jvmaccess,\ cppu \ + cppuhelper \ sal \ salhelper \ )) diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx index 4be1fedb7d26..c1a0d165f397 100644 --- a/jvmaccess/source/classpath.cxx +++ b/jvmaccess/source/classpath.cxx @@ -25,6 +25,7 @@ #include <vector> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -32,6 +33,7 @@ #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrlReference.hpp> #include <com/sun/star/util/theMacroExpander.hpp> +#include <cppuhelper/exc_hlp.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> @@ -66,9 +68,11 @@ jobjectArray jvmaccess::ClassPath::translateToUrls( try { url = expUrl->expand( expander ); } catch (const css::lang::IllegalArgumentException & e) { - throw css::uno::RuntimeException( + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( "com.sun.star.lang.IllegalArgumentException: " - + e.Message); + + e.Message, + nullptr, anyEx ); } } jvalue arg; |