diff options
Diffstat (limited to 'javaunohelper/source')
-rw-r--r-- | javaunohelper/source/bootstrap.cxx | 2 | ||||
-rw-r--r-- | javaunohelper/source/javaunohelper.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 4e2c10047967..d053d5793d2f 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -76,7 +76,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) //================================================================================================== extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( - JNIEnv * jni_env, jclass, jstring juno_rc, jobjectArray jpairs, + JNIEnv * jni_env, SAL_UNUSED_PARAMETER jclass, jstring juno_rc, jobjectArray jpairs, jobject loader ) { try diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 018c83e67ff0..9016b486ee3e 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,7 +63,7 @@ using ::rtl::OUString; */ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( - JNIEnv * pJEnv, jclass, jstring jLibName, jobject jSMgr, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jobject jSMgr, jobject jRegKey, jobject loader ) { sal_Bool bRet = sal_False; @@ -143,7 +143,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( */ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( - JNIEnv * pJEnv, jclass, jstring jLibName, jstring jImplName, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName, jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); @@ -239,7 +239,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( */ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory( - JNIEnv * pJEnv, jclass, jstring jWriteRegFile, + JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jWriteRegFile, jstring jReadRegFile, jboolean jbReadOnly, jobject loader ) { jobject joRegServiceFac = 0; @@ -265,7 +265,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor // bootstrap Reference< lang::XMultiServiceFactory > rMSFac; - if (aReadRegFile.getLength() == 0) + if (aReadRegFile.isEmpty()) rMSFac = ::cppu::createRegistryServiceFactory( aWriteRegFile, bReadOnly); else rMSFac = ::cppu::createRegistryServiceFactory(aWriteRegFile, aReadRegFile, bReadOnly); |