User: vg Date: 05/02/21 04:22:06 Modified: /dba/connectivity/source/drivers/mozab/ MDriver.cxx
Log: INTEGRATION: CWS mozab05 (1.10.40); FILE MERGED 2005/01/24 07:49:03 windly 1.10.40.2: #i20088# add thunderbird support 2005/01/17 05:30:43 windly 1.10.40.1: #i20088# Detect Mozilla Thunderbird Address Book: patchs for connectivity File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MDriver.cxx?r1=1.10&r2=1.11 Delta lines: +14 -1 -------------------- --- MDriver.cxx 2 Aug 2004 17:06:24 -0000 1.10 +++ MDriver.cxx 21 Feb 2005 12:22:03 -0000 1.11 @@ -174,10 +174,15 @@ if (s_pCreationFunc) { ::osl::MutexGuard aGuard(m_aMutex); + //We must make sure we create an com.sun.star.mozilla.MozillaBootstrap brfore call any mozilla codes + Reference<XInterface> xInstance = m_xMSFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + OSL_ENSURE( xInstance.is(), "failed to create instance" ); + OConnection* pCon = reinterpret_cast<OConnection*>((*s_pCreationFunc)(this)); xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) pCon->construct(url,info); // late constructor call which can throw exception and allows a correct dtor call when so m_xConnections.push_back(WeakReferenceHelper(*pCon)); + } else { @@ -260,6 +265,8 @@ if ( aAddrbookScheme.compareToAscii( MozabDriver::getSDBC_SCHEME_MOZILLA() ) == 0 ) return Mozilla; + if ( aAddrbookScheme.compareToAscii( MozabDriver::getSDBC_SCHEME_THUNDERBIRD() ) == 0 ) + return ThunderBird; if ( aAddrbookScheme.compareToAscii( MozabDriver::getSDBC_SCHEME_LDAP() ) == 0 ) return LDAP; @@ -278,6 +285,12 @@ { static sal_Char* SDBC_SCHEME_MOZILLA = MOZAB_MOZILLA_SCHEMA; return SDBC_SCHEME_MOZILLA; +} +// ----------------------------------------------------------------------------- +const sal_Char* MozabDriver::getSDBC_SCHEME_THUNDERBIRD() +{ + static sal_Char* SDBC_SCHEME_THUNDERBIRD = MOZAB_THUNDERBIRD_SCHEMA; + return SDBC_SCHEME_THUNDERBIRD; } // ----------------------------------------------------------------------------- const sal_Char* MozabDriver::getSDBC_SCHEME_LDAP() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
