diff options
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; |