diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:53:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:53:51 +0000 |
| commit | f6e0001761c02b6ad38225868c9a4db98e125321 (patch) | |
| tree | 6fbadfca3098d83c3d676e0e1eb44cf609152e1c | |
| parent | 309dbb05cbefc899e0a8bfd506e1ccddeb2315f5 (diff) | |
INTEGRATION: CWS jsc21 (1.6.32); FILE MERGED
2008/04/23 09:54:56 jsc 1.6.32.2: RESYNC: (1.6-1.7); FILE MERGED
2008/04/03 07:52:05 jsc 1.6.32.1: #i86121# use osl_loadModuleRelative instead of osl_loadModule
| -rw-r--r-- | javaunohelper/source/preload.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index 7c6b97ef7874..9d2d8a5eeeaf 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: preload.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -61,6 +61,8 @@ static fptr_createRegistryServiceFactory s_createRegistryServiceFactory; static fptr_bootstrap s_bootstrap; static bool s_inited = false; +extern "C" { static void SAL_CALL thisModule() {} } + //-------------------------------------------------------------------------------------------------- static bool inited_juhx( JNIEnv * jni_env ) { @@ -68,7 +70,7 @@ static bool inited_juhx( JNIEnv * jni_env ) return true; OUString lib_name = OUSTR(SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION); oslModule hModule = - osl_loadModule( lib_name.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); + osl_loadModuleRelative( &thisModule, lib_name.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (0 == hModule) { jclass c = jni_env->FindClass( "java/lang/RuntimeException" ); |