User: hr Date: 06/06/19 18:50:37 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MDatabaseMetaDataHelper.cxx
Log: INTEGRATION: CWS warnings01 (1.11.30); FILE MERGED 2006/04/07 20:23:14 sb 1.11.30.4: RESYNC: (1.11-1.12); FILE MERGED 2005/12/22 11:44:55 fs 1.11.30.3: #i57457# warning-free code 2005/11/16 12:59:15 fs 1.11.30.2: #i57457# warning free code 2005/11/07 14:43:55 fs 1.11.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MDatabaseMetaDataHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx?r1=1.12&r2=1.13 Delta lines: +25 -29 --------------------- --- MDatabaseMetaDataHelper.cxx 29 Mar 2006 12:18:25 -0000 1.12 +++ MDatabaseMetaDataHelper.cxx 20 Jun 2006 01:50:35 -0000 1.13 @@ -119,7 +119,7 @@ } } -extern sal_Bool MNS_Init(sal_Bool& aProfileExists,sal_Int32 nProduct); +extern sal_Bool MNS_Init(sal_Bool& aProfileExists); // ------------------------------------------------------------------------- MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() @@ -303,8 +303,6 @@ } // Case where we get a factory uri and need to have it build the directories. -static const char *kPropertyName = "uri" ; - static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } @@ -658,9 +656,7 @@ if ( !getTableStrings( _pCon, tables,tabletypes ) ) return sal_False; - const ::rtl::OUString* pTArray = types.getConstArray(); - - for ( sal_Int32 i = 0; i < tables.size(); i++ ) { + for ( size_t i = 0; i < tables.size(); i++ ) { ODatabaseMetaDataResultSet::ORow aRow(3); ::rtl::OUString aTableName = tables[i]; @@ -704,7 +700,7 @@ rtl::OUString sAbPassword; sal_Bool useSSL = _pCon->getUseSSL(); - nsresult rv; + nsresult rv(0); sAbURI = OUStringToOString( _pCon->getMozURI(), RTL_TEXTENCODING_ASCII_US ); sAbBindDN = _pCon->getBindDN(); @@ -755,7 +751,7 @@ args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; rv = xMProxy.StartProxy(&args,m_ProductType,::rtl::OUString()); //release resource } - return rv; + return NS_SUCCEEDED( rv ); } sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
