INTEGRATION: CWS warnings01 (1.8.8); FILE MERGED

2006/02/28 15:13:22 sb 1.8.8.4: #i53898# Made code waring-free.
2006/01/25 19:57:56 sb 1.8.8.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/23 02:50:34 sb 1.8.8.2: RESYNC: (1.8-1.9); FILE MERGED
2005/09/09 12:44:16 sb 1.8.8.1: #i53898# Made code warning-free.

1 files changed, 15 insertions, 13 deletions

diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 0a2e584f91dc..e7b52ddef337 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: javaunohelper.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2006-01-03 12:42:29 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 21:54:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -69,7 +69,7 @@ using ::rtl::OUString;
  */
 extern "C" JNIEXPORT jboolean JNICALL
 Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
-    JNIEnv * pJEnv, jclass jClass, jstring jLibName, jobject jSMgr,
+    JNIEnv * pJEnv, jclass, jstring jLibName, jobject jSMgr,
     jobject jRegKey, jobject loader )
 {
     sal_Bool bRet = sal_False;
@@ -81,11 +81,11 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (lib)
     {
-        void * pSym;
-
         // ========================= LATEST VERSION =========================
         OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
-        if (pSym = osl_getSymbol( lib, aGetEnvName.pData ))
+        oslGenericFunction pSym =
+            osl_getFunctionSymbol( lib, aGetEnvName.pData );
+        if (pSym)
         {
             Environment java_env, loader_env;
 
@@ -106,7 +106,8 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                 (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
 
             OUString aWriteInfoName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_WRITEINFO) );
-            if (pSym = osl_getSymbol( lib, aWriteInfoName.pData ))
+            pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
+            if (pSym)
             {
                 if (loader_env.is() && java_env.is())
                 {
@@ -148,7 +149,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 jClass, jstring jLibName, jstring jImplName,
+    JNIEnv * pJEnv, jclass, jstring jLibName, jstring jImplName,
     jobject jSMgr, jobject jRegKey, jobject loader )
 {
     const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL);
@@ -162,11 +163,11 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (lib)
     {
-        void * pSym;
-
         // ========================= LATEST VERSION =========================
         OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
-        if (pSym = osl_getSymbol( lib, aGetEnvName.pData ))
+        oslGenericFunction pSym =
+            osl_getFunctionSymbol( lib, aGetEnvName.pData );
+        if (pSym)
         {
             Environment java_env, loader_env;
 
@@ -188,7 +189,8 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                 (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
 
             OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) );
-            if (pSym = osl_getSymbol( lib, aGetFactoryName.pData ))
+            pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
+            if (pSym)
             {
                 if (loader_env.is() && java_env.is())
                 {
@@ -243,7 +245,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 jClass, jstring jWriteRegFile,
+    JNIEnv * pJEnv, jclass, jstring jWriteRegFile,
     jstring jReadRegFile, jboolean jbReadOnly, jobject loader )
 {
     jobject joRegServiceFac = 0;