CWS-TOOLING: integrate CWS cmcfixes50

2008-11-10 13:31:50 +0100 cmc  r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc  r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc  r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc  r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc  r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc  r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc  r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc  r263311 : 

12 files changed, 33 insertions, 23 deletions

diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 11201fedd6..974556971f 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -255,8 +255,8 @@ namespace connectivity
         ORowSetValue& operator=(const ::com::sun::star::uno::Any& _rAny);
 
         operator sal_Bool() const	{	return isNull() ? sal_False : getBool();	}
-        operator sal_Int8() const	{	return isNull() ? 0			: getInt8();	}
-        operator sal_Int16() const	{	return isNull() ? 0			: getInt16();	}
+        operator sal_Int8() const	{	return isNull() ? static_cast<sal_Int8>(0) : getInt8();	}
+        operator sal_Int16() const	{	return isNull() ? static_cast<sal_Int16>(0) : getInt16();	}
         operator sal_Int32() const	{	return isNull() ? 0			: getInt32();	}
         operator sal_Int64() const	{	return isNull() ? 0			: getLong();	}
         operator float() const		{	return isNull() ? (float)0.0: getFloat();	}
@@ -301,10 +301,10 @@ namespace connectivity
         }
 
         sal_Bool	isBound() const						{ return m_bBound;		}
-        void		setBound(sal_Bool _bBound)			{ m_bBound = _bBound;	}
+        void		setBound(sal_Bool _bBound)			{ m_bBound = _bBound ? true : false; }
 
         sal_Bool	isModified() const					{ return m_bModified;	}
-        void		setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod;	}
+        void		setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? true : false;	}
 
         sal_Bool	isSigned() const					{ return m_bSigned;	}
         void		setSigned(sal_Bool _bMod=sal_True);
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 9436510087..c3dd5eb478 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -410,7 +410,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr
 OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode)	throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() >= 3,"OFILECursor: Fehler im Parse Tree");
-    DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree")
+    DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree");
 
     sal_Int32 ePredicateType;
     if (SQL_ISTOKEN(pPredicateNode->getChild(2),NOT))
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 435f1dec66..973ae1ddff 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -112,7 +112,7 @@ namespace
             const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] );
             if ( pProfileByEnv )
             {
-                sProductPath = ::rtl::OUString( pProfileByEnv, strlen( pProfileByEnv ), osl_getThreadTextEncoding() );
+                sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() );
                 // asume that this is fine, no further checks
             }
             else
@@ -162,7 +162,7 @@ namespace
 
     return lcl_guessProfileRoot( product );
 }
-
+#ifndef MINIMAL_PROFILEDISCOVER
 // -----------------------------------------------------------------------
 ::rtl::OUString getRegistryFileName(MozillaProductType product)
 {
@@ -171,5 +171,4 @@ namespace
 
     return getRegistryDir(product) + ::rtl::OUString::createFromAscii(APP_REGISTRY_NAME);
 }
-
-
+#endif
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index a042a76cba..1bc4b9c2c2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
@@ -41,7 +41,9 @@
 #include <rtl/ustring.hxx>
 
 ::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product);
+#ifndef MINIMAL_PROFILEDISCOVER
 ::rtl::OUString getRegistryFileName(::com::sun::star::mozilla::MozillaProductType product);
+#endif
 
 #endif
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index d15c969057..7c71ab1041 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -166,7 +166,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
     nsCOMPtr<nsIEventQueueService> eventQService(
                 do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv));
     if (NS_FAILED(rv))
-      return NS_SUCCEEDED( rv );
+      return NS_SUCCEEDED( rv ) ? sal_True : sal_False;
 
     eventQService->CreateThreadEventQueue();
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 5847dd2b0a..3ac42b4c5b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -150,7 +150,7 @@ namespace connectivity
             //load mozilla profiles to m_ProductProfileList
             LoadMozillaProfiles();
 #endif
-            sal_Int32 count=m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size();
+            sal_Int32 count=static_cast<sal_Int32>(m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size());
             
             //load thunderbird profiles to m_ProductProfileList
             count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
@@ -362,7 +362,7 @@ namespace connectivity
                 }
             
             }
-            return m_Product.mProfileList.size();
+            return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
 
         ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
@@ -382,13 +382,13 @@ namespace connectivity
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
-            return m_Product.mProfileList.size();
+            return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
         ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
-            list.realloc(m_Product.mProfileList.size());
+            list.realloc(static_cast<sal_Int32>(m_Product.mProfileList.size()));
             sal_Int32 i=0;
             for(ProfileList::iterator itor=m_Product.mProfileList.begin();
                 itor != m_Product.mProfileList.end();
@@ -399,7 +399,7 @@ namespace connectivity
                 i++;
             }
             
-            return m_Product.mProfileList.size();
+            return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
 
         ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 4148e6b073..80ca89d28e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -67,6 +67,7 @@ SLOFILES += \
 CDEFS+=-DMINIMAL_PROFILEDISCOVER
 
 SHL1TARGET=$(TARGET)
+SHL1VERSIONMAP= $(TARGET).map
 SHL1OBJS=$(SLOFILES)
 
 SHL1STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map
new file mode 100644
index 0000000000..750db5d4af
--- /dev/null
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map
@@ -0,0 +1,8 @@
+MOZBOOTSTRAP_1_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+        *;
+};
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 6df6030e88..3f5581a169 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -685,7 +685,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
 
     sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA );
     if ( pos != -1 ) {
-        sAbURI = sAbURI.replaceAt (pos, strlen( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) );
+        sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) );
     }
 
     pos = sAbURI.indexOf( QUERY_CHAR );
@@ -730,7 +730,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
         }
     }
     setError( STR_COULD_NOT_CONNECT_LDAP );
-    return NS_SUCCEEDED( rv );
+    return NS_SUCCEEDED( rv ) ? sal_True : sal_False;
 }
 
 sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName)
@@ -767,7 +767,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl:
         setAbSpecificError( _pCon, !bIsMozillaAB );
     }
     OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()\n" );
-    return( NS_SUCCEEDED(rv) );
+    return( NS_SUCCEEDED(rv) ? sal_True : sal_False );
 }
 nsresult NewAddressBook(const ::rtl::OUString * aName)
 {
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 7027252134..b1f2eaa49f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -267,7 +267,7 @@ void MLDAPMessageListener::setConnectionStatus( sal_Bool _good )
 
 NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection* /*aConn*/, nsresult aStatus )
 {
-    setConnectionStatus( NS_SUCCEEDED( aStatus ) );
+    setConnectionStatus( NS_SUCCEEDED( aStatus ) ? sal_True : sal_False );
     return aStatus;
 }
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 7ec900425f..c31c45d483 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -800,7 +800,7 @@ MQuery::resyncRow(sal_Int32 nDBRow)
     args.arg2 = (void*)&nDBRow;
     nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile);
     setError( m_aQueryHelper->getErrorResourceId() );
-    return NS_SUCCEEDED( rv );
+    return NS_SUCCEEDED( rv ) ? sal_True : sal_False;
 }
 
 sal_Int32
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 6cc2a42d17..80738adc1a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -390,7 +390,7 @@ MQueryHelper::getResultCount() const
     else
     {
         OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = %d\n", m_aResults.size() );
-        return m_aResults.size();
+        return static_cast<sal_Int32>(m_aResults.size());
     }
 }
 
@@ -400,7 +400,7 @@ sal_uInt32
 MQueryHelper::getRealCount() const
 {
     OSL_TRACE( "IN/OUT MQueryHelper::getRealCount() = %d\n", m_aResults.size() );
-    return m_aResults.size();
+    return static_cast<sal_Int32>(m_aResults.size());
 }
 
 // -------------------------------------------------------------------------
@@ -996,6 +996,6 @@ sal_Int32			MQueryHelper::createNewCard()
     nsCOMPtr <nsIAbCard> card = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv);
     //set default values
       getCardValues(card);
-    return   m_aResults.size();
+    return static_cast<sal_Int32>(m_aResults.size());
 }