diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:22:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:22:03 +0000 |
| commit | 78d93b05c918c783df2f74908b0e86587e46141b (patch) | |
| tree | 45d6afeca0c7d07f047fe8571a251c6d519679b3 /connectivity | |
| parent | cd97d624bfba9b4f69d1d2b162d8348f9ce1a5ff (diff) | |
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
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/MDriver.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 1a6c0d072608..43f228b18d05 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MDriver.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2004-08-02 17:06:24 $ + * last change: $Author: vg $ $Date: 2005-02-21 12:22:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -174,10 +174,15 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u 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 @@ EDriverType MozabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) 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; @@ -280,6 +287,12 @@ const sal_Char* MozabDriver::getSDBC_SCHEME_MOZILLA() 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() { static sal_Char* SDBC_SCHEME_LDAP = MOZAB_LDAP_SCHEMA; |