User: vg Date: 05/02/21 04:21:30 Modified: /dba/connectivity/source/drivers/mozab/ MConnection.cxx
Log: INTEGRATION: CWS mozab05 (1.17.16); FILE MERGED 2005/01/28 07:21:41 windly 1.17.16.2: #i20088# thunderbird support 2005/01/17 05:30:42 windly 1.17.16.1: #i20088# Detect Mozilla Thunderbird Address Book: patchs for connectivity File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.cxx?r1=1.17&r2=1.18 Delta lines: +16 -10 --------------------- --- MConnection.cxx 22 Oct 2004 11:31:46 -0000 1.17 +++ MConnection.cxx 21 Feb 2005 12:21:27 -0000 1.18 @@ -79,15 +79,9 @@ #ifndef _COM_SUN_STAR_SDBC_TRANSACTIONISOLATION_HPP_ #include <com/sun/star/sdbc/TransactionIsolation.hpp> #endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ -#include <com/sun/star/lang/DisposedException.hpp> -#endif #ifndef _DBHELPER_DBCHARSET_HXX_ #include <connectivity/dbcharset.hxx> #endif -#ifndef _COMPHELPER_EXTRACT_HXX_ -#include <comphelper/extract.hxx> -#endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -105,7 +99,6 @@ using namespace connectivity::mozab; -// using namespace connectivity; using namespace dbtools; //------------------------------------------------------------------------------ @@ -125,6 +118,12 @@ return SDBC_SCHEME_MOZILLA; } // ----------------------------------------------------------------------------- +const sal_Char* OConnection::getSDBC_SCHEME_THUNDERBIRD() +{ + static sal_Char* SDBC_SCHEME_THUNDERBIRD = MOZAB_THUNDERBIRD_SCHEMA; + return SDBC_SCHEME_THUNDERBIRD; +} +// ----------------------------------------------------------------------------- const sal_Char* OConnection::getSDBC_SCHEME_LDAP() { static sal_Char* SDBC_SCHEME_LDAP = MOZAB_LDAP_SCHEMA; @@ -153,7 +152,6 @@ : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_pDriver(_pDriver), m_xMetaData(NULL), - m_nAnonABCount( 0 ), m_nMaxResultRecords( -1 ), m_eSDBCAddressType(SDBCAddress::Unknown), m_aNameMapper(NULL) @@ -168,8 +166,6 @@ { if(!isClosed()) close(); - - m_pDriver->release(); m_pDriver = NULL; } @@ -241,6 +237,16 @@ if ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_MOZILLA() ) == 0 ) { m_sMozillaURI = rtl::OUString::createFromAscii( MOZ_SCHEME_MOZILLA ); m_eSDBCAddressType = SDBCAddress::Mozilla; + if(sAdditionalInfo.getLength()) + m_sMozillaProfile = sAdditionalInfo; + } + else + if ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_THUNDERBIRD() ) == 0 ) { + //Yes. I am sure it is MOZ_SCHEME_MOZILLA + m_sMozillaURI = rtl::OUString::createFromAscii( MOZ_SCHEME_MOZILLA ); + m_eSDBCAddressType = SDBCAddress::ThunderBird; + if(sAdditionalInfo.getLength()) + m_sMozillaProfile = sAdditionalInfo; } else if ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_LDAP() ) == 0 ) { rtl::OUString sBaseDN; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
