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

Remove createRegistryServiceFactory preload left-over

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

Change-Id: Iccdcb68c6051a64a09ae7918eecb8d3e2c53a085
This commit is contained in:
Stephan Bergmann 2013-04-11 12:40:29 +02:00
parent 0ea1711e98
commit 8efcfadac5
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
javaunohelper/source/preload.cxx
View file

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