strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Need also uno_ext_getMapping for Java when DISABLE_DYNLOADING

Browse source 
Change-Id: I65f09e54c80df4e96e24548692eeb3a57e1de517
This commit is contained in:
Tor Lillqvist 2012-09-21 14:29:16 +03:00 committed by Tor Lillqvist
parent e5045bea0a
commit f09f52e4ad
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bridges/source/jni_uno/jni_bridge.cxx
View file

@ -474,6 +474,10 @@ void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
machine->acquire();
}
#ifdef DISABLE_DYNLOADING
#define uno_ext_getMapping java_uno_ext_getMapping
#endif
//------------------------------------------------------------------------------
void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )

10
cppu/inc/uno/mapping.h
View file

@ -193,6 +193,16 @@ void SAL_CALL CPPU_ENV_uno_ext_getMapping(
struct _uno_Environment * pFrom,
struct _uno_Environment * pTo )
SAL_THROW_EXTERN_C();
#ifdef SOLAR_JAVA
/* This is the uno_ext_getMapping function in the Java/UNO bridge */
void SAL_CALL java_uno_ext_getMapping(
struct _uno_Mapping ** ppMapping,
struct _uno_Environment * pFrom,
struct _uno_Environment * pTo )
SAL_THROW_EXTERN_C();
#endif
#endif
#ifdef __cplusplus

5
cppu/source/uno/lbmap.cxx
View file

@ -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