DISABLE_DYNLOADING magic also for the jni_uno environment

Change-Id: I5e966a5734308381ad305b891ecfc830dc1419f6

bridges/source/jni_uno/jni_bridge.cxx

@@ -456,6 +456,10 @@ void SAL_CALL java_env_disposing( uno_Environment * java_env )
 }
 }
 
+#ifdef DISABLE_DYNLOADING
+#define uno_initEnvironment java_uno_initEnvironment
+#endif
+
 //------------------------------------------------------------------------------
 void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
     SAL_THROW_EXTERN_C()
@@ -554,12 +558,17 @@ void SAL_CALL uno_ext_getMapping(
     }
 }
 
+#ifndef DISABLE_DYNLOADING
+
 //------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
     SAL_THROW_EXTERN_C()
 {
     return (*g_moduleCount.canUnload)( &g_moduleCount, pTime );
 }
+
+#endif
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cppu/inc/uno/environment.h

@@ -258,9 +258,14 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
 #define UNO_INIT_ENVIRONMENT "uno_initEnvironment"
 
 #ifdef DISABLE_DYNLOADING
-/* We link statically and have just one kind of environment */
+/* We link statically and have just the C++ environment */
 void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env )
      SAL_THROW_EXTERN_C();
+#ifdef SOLAR_JAVA
+/* We also have the Java environment */
+void SAL_CALL java_uno_initEnvironment( uno_Environment * Env )
+     SAL_THROW_EXTERN_C();
+#endif
 #endif
 
 /** Gets a specific environment. If the specified environment does not exist, then a default one

cppu/source/uno/lbenv.cxx

@@ -1058,6 +1058,10 @@ static bool loadEnv(OUString const  & cLibStem,
 
     if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
         fpInit = CPPU_ENV_uno_initEnvironment;
+#ifdef SOLAR_JAVA
+    else if ( cLibStem == "java_uno" )
+        fpInit = java_uno_initEnvironment;
+#endif
     else
     {
 #if OSL_DEBUG_LEVEL > 1