User: hr Date: 06/06/19 18:52:04 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQuery.cxx
Log: INTEGRATION: CWS warnings01 (1.15.30); FILE MERGED 2006/04/07 20:23:07 sb 1.15.30.3: RESYNC: (1.15-1.16); FILE MERGED 2005/12/22 11:44:55 fs 1.15.30.2: #i57457# warning-free code 2005/11/07 14:43:57 fs 1.15.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MQuery.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx?r1=1.16&r2=1.17 Delta lines: +22 -22 --------------------- --- MQuery.cxx 29 Mar 2006 12:19:08 -0000 1.16 +++ MQuery.cxx 20 Jun 2006 01:52:02 -0000 1.17 @@ -436,27 +436,27 @@ const char * uri; retCode=rdfResource->GetValueConst(&uri); if (NS_FAILED(retCode)) { return SDBCAddress::Unknown; } - const sal_Char *sUriPrefix = ::connectivity::mozab::MOZ_SCHEME_LDAP; + const sal_Char *sUriPrefix = ::connectivity::mozab::getSchemeURI( ::connectivity::mozab::SCHEME_LDAP ); if (strncmp(uri,sUriPrefix,strlen(sUriPrefix)) == 0) { return SDBCAddress::LDAP; } - sUriPrefix = ::connectivity::mozab::MOZ_SCHEME_MOZILLA; + sUriPrefix = ::connectivity::mozab::getSchemeURI( ::connectivity::mozab::SCHEME_MOZILLA ); if (strncmp(uri,sUriPrefix,strlen(sUriPrefix)) == 0) { return SDBCAddress::Mozilla; } - sUriPrefix = ::connectivity::mozab::MOZ_SCHEME_MOZILLA_MDB; + sUriPrefix = ::connectivity::mozab::getSchemeURI( ::connectivity::mozab::SCHEME_MOZILLA_MDB ); if (strncmp(uri,sUriPrefix,strlen(sUriPrefix)) == 0) { return SDBCAddress::Mozilla; } - sUriPrefix = ::connectivity::mozab::MOZ_SCHEME_OUTLOOK_EXPRESS; + sUriPrefix = ::connectivity::mozab::getSchemeURI( ::connectivity::mozab::SCHEME_OUTLOOK_EXPRESS ); if (strncmp(uri,sUriPrefix,strlen(sUriPrefix)) == 0) { return SDBCAddress::OutlookExp; } - sUriPrefix = ::connectivity::mozab::MOZ_SCHEME_OUTLOOK_MAPI; + sUriPrefix = ::connectivity::mozab::getSchemeURI( ::connectivity::mozab::SCHEME_OUTLOOK_MAPI ); if (strncmp(uri,sUriPrefix,strlen(sUriPrefix)) == 0) { return SDBCAddress::Outlook; @@ -837,7 +837,7 @@ args.arg2 = (void*)&nDBRow; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); setError( m_aQueryHelper->getErrorResourceId() ); - return rv; + return NS_SUCCEEDED( rv ); } sal_Int32 @@ -888,6 +888,6 @@ rv = directory->GetOperations (&isWriteable); if (NS_FAILED(rv)) return sal_False; - sal_Bool bWritable = isWriteable & nsIAbDirectory::opWrite; + sal_Bool bWritable = ( isWriteable & nsIAbDirectory::opWrite ) == nsIAbDirectory::opWrite; return bWritable; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
