summaryrefslogtreecommitdiff
path: root/cppu/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-20 12:42:48 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-09-20 12:52:15 +0300
commit69765868e30494eb39a2b4b7566f161ef1f3db04 (patch)
tree2aa7e54700965729ae5c890f9d8d724e282c1799 /cppu/source
parent1f77f1ac177521698ee7c978f218127cb5840046 (diff)
DISABLE_DYNLOADING magic also for the jni_uno environment
Change-Id: I5e966a5734308381ad305b891ecfc830dc1419f6
Diffstat (limited to 'cppu/source')
-rw-r--r--cppu/source/uno/lbenv.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ff6de9a9a815..439d49bf8748 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/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