summaryrefslogtreecommitdiff
path: root/cppu/source/uno
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-21 14:29:16 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-09-21 14:46:24 +0300
commitf09f52e4add4999264bbf960a3a7af6a6b7a8285 (patch)
tree77904ee4d16a84bf3fa1e67f2f9504769d828817 /cppu/source/uno
parente5045bea0ab261e47c2829d33cd8e383dfb8e684 (diff)
Need also uno_ext_getMapping for Java when DISABLE_DYNLOADING
Change-Id: I65f09e54c80df4e96e24548692eeb3a57e1de517
Diffstat (limited to 'cppu/source/uno')
-rw-r--r--cppu/source/uno/lbmap.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 2720811d0bea..e6892d453d9d 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -329,6 +329,11 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName )
{
if (rBridgeName.equalsAscii( CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ))
return CPPU_ENV_uno_ext_getMapping;
+#ifdef SOLAR_JAVA
+ if (rBridgeName.equalsAscii( "java" "_uno" ))
+ return java_uno_ext_getMapping;
+#endif
+
#if 0
// I don't think the affine or log bridges will be needed on any
// DISABLE_DYNLOADING platform (iOS at least, possibly Android), but if