Export JNI functions from juh, juhx libs

...this had been broken with gbuild'ification of javaunohelper and caused
java.lang.UnsatisfiedLinkError from
com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap, as could be witnessed
by test-javanative in ure/source/uretest/Makefile failing.

Change-Id: I8a76e1195c713895bfb8eae5070b0f73beb2b897

4 files changed, 8 insertions, 34 deletions

diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 2e9fff19a956..5c6ac0a382ff 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -66,7 +66,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
 }
 
 //==================================================================================================
-extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
+extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
     JNIEnv * jni_env, SAL_UNUSED_PARAMETER jclass, jstring juno_rc, jobjectArray jpairs,
     jobject loader )
 {
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 498a55600648..a36cf584a147 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -52,7 +52,7 @@ using ::rtl::OUString;
  * Method:    component_writeInfo
  * Signature: (Ljava/lang/String;Lcom/sun/star/lang/XMultiServiceFactory;Lcom/sun/star/registry/XRegistryKey;)Z
  */
-extern "C" JNIEXPORT jboolean JNICALL
+extern "C" SAL_DLLPUBLIC_EXPORT jboolean JNICALL
 Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jobject jSMgr,
     jobject jRegKey, jobject loader )
@@ -132,7 +132,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
  * Method:    component_getFactory
  * Signature: (Ljava/lang/String;Ljava/lang/String;Lcom/sun/star/lang/XMultiServiceFactory;Lcom/sun/star/registry/XRegistryKey;)Ljava/lang/Object;
  */
-extern "C" JNIEXPORT jobject JNICALL
+extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL
 Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName,
     jobject jSMgr, jobject jRegKey, jobject loader )
@@ -228,7 +228,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
  * Method:    createRegistryServiceFactory
  * Signature: (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/Object;
  */
-extern "C" JNIEXPORT jobject JNICALL
+extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL
 Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory(
     JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jWriteRegFile,
     jstring jReadRegFile, jboolean jbReadOnly, jobject loader )
diff --git a/javaunohelper/source/javaunohelper.map b/javaunohelper/source/javaunohelper.map
deleted file mode 100644
index c89f0bc056e9..000000000000
--- a/javaunohelper/source/javaunohelper.map
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-UDK_3_0_0 {
-    global:
-    Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo;
-    Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory;
-    Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory;
-    Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap;
-    local:
-    *;
-};
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index a4774bec99af..c188d82a4ea7 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -105,7 +105,7 @@ static bool inited_juhx( JNIEnv * jni_env )
 }
 
 //==================================================================================================
-JNIEXPORT jboolean JNICALL
+SAL_DLLPUBLIC_EXPORT jboolean JNICALL
 Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     JNIEnv * pJEnv, jclass jClass, jstring jLibName, jobject jSMgr,
     jobject jRegKey, jobject loader )
@@ -116,7 +116,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     return JNI_FALSE;
 }
 //==================================================================================================
-JNIEXPORT jobject JNICALL
+SAL_DLLPUBLIC_EXPORT jobject JNICALL
 Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     JNIEnv * pJEnv, jclass jClass, jstring jLibName, jstring jImplName,
     jobject jSMgr, jobject jRegKey, jobject loader )
@@ -127,7 +127,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     return 0;
 }
 //==================================================================================================
-JNIEXPORT jobject JNICALL
+SAL_DLLPUBLIC_EXPORT jobject JNICALL
 Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory(
     JNIEnv * pJEnv, jclass jClass, jstring jWriteRegFile,
     jstring jReadRegFile, jboolean jbReadOnly, jobject loader )
@@ -140,7 +140,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
     return 0;
 }
 //==================================================================================================
-JNIEXPORT jobject JNICALL
+SAL_DLLPUBLIC_EXPORT jobject JNICALL
 Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
     JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs,
     jobject loader )