Kaydet (Commit) 74db7031 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

DISABLE_DYNLOADING tentative fix

Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01
üst c56600df
...@@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( ...@@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
OUString aLibName( pJLibName ); OUString aLibName( pJLibName );
pJEnv->ReleaseStringChars( jLibName, 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 ); oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
if (lib) if (lib)
{ {
...@@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( ...@@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
} }
} }
} }
#endif
return bRet == sal_False? JNI_FALSE : JNI_TRUE; return bRet == sal_False? JNI_FALSE : JNI_TRUE;
} }
...@@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
jobject jSMgr, jobject jRegKey, jobject loader ) jobject jSMgr, jobject jRegKey, jobject loader )
{ {
const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); 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 ); OUString aLibName( pJLibName );
pJEnv->ReleaseStringChars( jLibName, pJLibName); pJEnv->ReleaseStringChars( jLibName, pJLibName);
...@@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
jobject joSLL_cpp = 0; jobject joSLL_cpp = 0;
#ifndef DISABLE_DYNLOADING
oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
if (lib) if (lib)
{ {
...@@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
} }
} }
} }
#endif
return joSLL_cpp; return joSLL_cpp;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment