Kaydet (Commit) 8efcfada authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove createRegistryServiceFactory preload left-over

...forgotten from f3051abd "API CHANGE: Remove
deprecated cppuhelper/servicefactory.hxx and Java equiv."

Change-Id: Iccdcb68c6051a64a09ae7918eecb8d3e2c53a085
üst 0ea1711e
...@@ -38,14 +38,11 @@ typedef jboolean (JNICALL * fptr_writeInfo)( ...@@ -38,14 +38,11 @@ typedef jboolean (JNICALL * fptr_writeInfo)(
JNIEnv *, jclass, jstring, jobject, jobject, jobject ); JNIEnv *, jclass, jstring, jobject, jobject, jobject );
typedef jobject (JNICALL * fptr_getFactory)( typedef jobject (JNICALL * fptr_getFactory)(
JNIEnv *, jclass, jstring, jstring, jobject, jobject, jobject ); JNIEnv *, jclass, jstring, jstring, jobject, jobject, jobject );
typedef jobject (JNICALL * fptr_createRegistryServiceFactory)(
JNIEnv *, jclass, jstring, jstring, jboolean, jobject );
typedef jobject (JNICALL * fptr_bootstrap)( typedef jobject (JNICALL * fptr_bootstrap)(
JNIEnv *_env, jclass, jstring, jobjectArray, jobject ); JNIEnv *_env, jclass, jstring, jobjectArray, jobject );
static fptr_writeInfo s_writeInfo; static fptr_writeInfo s_writeInfo;
static fptr_getFactory s_getFactory; static fptr_getFactory s_getFactory;
static fptr_createRegistryServiceFactory s_createRegistryServiceFactory;
static fptr_bootstrap s_bootstrap; static fptr_bootstrap s_bootstrap;
static bool s_inited = false; static bool s_inited = false;
...@@ -76,11 +73,6 @@ static bool inited_juhx( JNIEnv * jni_env ) ...@@ -76,11 +73,6 @@ static bool inited_juhx( JNIEnv * jni_env )
"Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory"; "Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory";
s_getFactory = (fptr_getFactory)osl_getFunctionSymbol( s_getFactory = (fptr_getFactory)osl_getFunctionSymbol(
hModule, symbol.pData ); hModule, symbol.pData );
symbol =
"Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory";
s_createRegistryServiceFactory =
(fptr_createRegistryServiceFactory)osl_getFunctionSymbol(
hModule, symbol.pData );
symbol = symbol =
"Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap"; "Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap";
s_bootstrap = s_bootstrap =
...@@ -88,7 +80,6 @@ static bool inited_juhx( JNIEnv * jni_env ) ...@@ -88,7 +80,6 @@ static bool inited_juhx( JNIEnv * jni_env )
if (0 == s_writeInfo || if (0 == s_writeInfo ||
0 == s_getFactory || 0 == s_getFactory ||
0 == s_createRegistryServiceFactory ||
0 == s_bootstrap) 0 == s_bootstrap)
{ {
jclass c = jni_env->FindClass( "java/lang/RuntimeException" ); jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
...@@ -125,19 +116,6 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -125,19 +116,6 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
} }
//================================================================================================== //==================================================================================================
SAL_DLLPUBLIC_EXPORT jobject JNICALL SAL_DLLPUBLIC_EXPORT jobject JNICALL
Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory(
JNIEnv * pJEnv, jclass jClass, jstring jWriteRegFile,
jstring jReadRegFile, jboolean jbReadOnly, jobject loader )
{
if (inited_juhx( pJEnv ))
{
return (*s_createRegistryServiceFactory)(
pJEnv, jClass, jWriteRegFile, jReadRegFile, jbReadOnly, loader );
}
return 0;
}
//==================================================================================================
SAL_DLLPUBLIC_EXPORT jobject JNICALL
Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs, JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs,
jobject loader ) jobject loader )
......
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