[Libreoffice-commits] core.git: javaunohelper/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 4 11:56:35 UTC 2020


 javaunohelper/source/preload.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 59cd904caf5d4c5dd363e0c0b4d71e638f0ffe2a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jun 4 11:33:37 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jun 4 13:55:50 2020 +0200

    Upcoming loplugin:elidestringvar: javaunohelper
    
    Change-Id: Ia81a0f0b804eb41235e310deac5818731397fdd8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95492
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index d491e9b4dbfb..4868a1e55f5e 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -50,9 +50,8 @@ static bool inited_juhx( JNIEnv * jni_env )
 {
     if (s_inited)
         return true;
-    OUString lib_name = SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION;
     osl::Module aModule;
-    if (!aModule.loadRelative(&thisModule, lib_name, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL))
+    if (!aModule.loadRelative(&thisModule, SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL))
     {
         jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
         jni_env->ThrowNew(


More information about the Libreoffice-commits mailing list