ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Don't use Library_tl in URE libraries

Browse Source 
This partly reverts 8b5e23eac3 "log nice exception
messages whereever possible", e1eb7cb04a
"loplugin:logexceptionnicely in starmath..svgio",
d6d80c4e17 "OSL_FAIL.*exception ->
TOOLS_WARN_EXCEPTION", and 877f40ac3f "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>
This commit is contained in:
Stephan Bergmann
2022-02-25 08:20:55 +01:00
parent ea25606de5
commit 9c431f4d3a
12 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javaunohelper/Library_juhx.mk
-1
View File
@@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,juhx,\
jvmaccess \
sal \
salhelper \
tl \
))
$(eval $(call gb_Library_add_exception_objects,juhx,\
javaunohelper/source/bootstrap.cxx
+2 -5
View File
@@ -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() );