diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-24 14:31:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-25 08:20:55 +0100 |
| commit | 9c431f4d3afed0aad21b5ba67a5a55328c4d0685 (patch) | |
| tree | 944e73da2e0cd35e9e10d3787e7c68773ffde3f8 /javaunohelper | |
| parent | ea25606de5f1a60430a74107b0e2e0986ac1bb15 (diff) | |
Don't use Library_tl in URE libraries
This partly reverts 8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 "log nice exception
messages whereever possible", e1eb7cb04a4c30cec238ab0f54d41a6cdc3299c1
"loplugin:logexceptionnicely in starmath..svgio",
d6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 "OSL_FAIL.*exception ->
TOOLS_WARN_EXCEPTION", and 877f40ac3f2add2b6dc37bae280d4d98dd102286 "tdf#42949
Fix new IWYU warnings in directories [h-r]*", and adapts
loplugin:logexceptionnicely accordingly.
Change-Id: I792b853b988c7c5f77179ca0672c30cb4223b5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130502
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/Library_juhx.mk | 1 | ||||
| -rw-r--r-- | javaunohelper/source/bootstrap.cxx | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index 6eacff250c0f..1a24e5ef54f2 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,juhx,\ jvmaccess \ sal \ salhelper \ - tl \ )) $(eval $(call gb_Library_add_exception_objects,juhx,\ diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index cec9d500ba9c..1cacea950c0d 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -44,7 +44,6 @@ #endif #include <jvmaccess/unovirtualmachine.hxx> -#include <tools/diagnose_ex.h> #include "juhx-export-functions.hxx" #include "vm.hxx" @@ -156,11 +155,10 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( } catch (const RuntimeException & exc) { - css::uno::Any exAny( cppu::getCaughtException() ); jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" ); if (nullptr != c) { - SAL_WARN("javaunohelper", "forwarding RuntimeException: " << exceptionToString(exAny) ); + SAL_WARN("javaunohelper", "forwarding RuntimeException: " << exc ); OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); jni_env->ThrowNew( c, cstr.getStr() ); @@ -168,11 +166,10 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( } catch (const Exception & exc) { - css::uno::Any ex( cppu::getCaughtException() ); jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" ); if (nullptr != c) { - SAL_WARN("javaunohelper", "forwarding Exception: " << exceptionToString(ex) ); + SAL_WARN("javaunohelper", "forwarding Exception: " << exc ); OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); jni_env->ThrowNew( c, cstr.getStr() ); |