diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-07 10:49:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-07 10:59:15 +0300 |
| commit | 74db703172baa3b2c7e3a77b54260a340777d266 (patch) | |
| tree | 0bacee89c18457925dca4e19d01786dc213f2a79 /javaunohelper | |
| parent | c56600dfbeaf687f249e4fb641044595892b4ebc (diff) | |
DISABLE_DYNLOADING tentative fix
Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/source/javaunohelper.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index a36cf584a147..374b6386dc3e 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( OUString aLibName( pJLibName ); pJEnv->ReleaseStringChars( jLibName, pJLibName); +#ifdef DISABLE_DYNLOADING + (void) jSMgr; + (void) jRegKey; + (void) loader; + + fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#else oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( } } } - +#endif return bRet == sal_False? JNI_FALSE : JNI_TRUE; } @@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); + +#ifdef DISABLE_DYNLOADING + (void) jImplName; + (void) jSMgr; + (void) jRegKey; + (void) loader; + + fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#endif + OUString aLibName( pJLibName ); pJEnv->ReleaseStringChars( jLibName, pJLibName); @@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject joSLL_cpp = 0; +#ifndef DISABLE_DYNLOADING oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( } } } - +#endif return joSLL_cpp; } |