diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-11 12:40:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-11 14:24:07 +0200 |
| commit | 8efcfadac5eb3439d40895c040e3163aed833360 (patch) | |
| tree | dc3346a02d95b42c7ef9ada0db6bbf0ea91c0142 /javaunohelper | |
| parent | 0ea1711e983775beb13b08d05637fe88ec534f0b (diff) | |
Remove createRegistryServiceFactory preload left-over
...forgotten from f3051abde54e7a0bc3e2d184e31ac011e96d3e6b "API CHANGE: Remove
deprecated cppuhelper/servicefactory.hxx and Java equiv."
Change-Id: Iccdcb68c6051a64a09ae7918eecb8d3e2c53a085
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/source/preload.cxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index 85eb09266dfe..5575af033eda 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -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; @@ -77,18 +74,12 @@ static bool inited_juhx( JNIEnv * jni_env ) 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 = (fptr_bootstrap)osl_getFunctionSymbol( hModule, symbol.pData ); 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 ) |