User: vg Date: 05/02/21 04:21:45 Modified: /dba/connectivity/source/drivers/mozab/ MConnection.hxx
Log: INTEGRATION: CWS mozab05 (1.11.46); FILE MERGED 2005/01/28 07:21:41 windly 1.11.46.2: #i20088# thunderbird support 2005/01/17 05:30:43 windly 1.11.46.1: #i20088# Detect Mozilla Thunderbird Address Book: patchs for connectivity File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.hxx?r1=1.11&r2=1.12 Delta lines: +29 -14 --------------------- --- MConnection.hxx 25 Jun 2004 18:27:40 -0000 1.11 +++ MConnection.hxx 21 Feb 2005 12:21:42 -0000 1.12 @@ -92,6 +92,9 @@ #ifndef _CPPUHELPER_WEAKREF_HXX_ #include <cppuhelper/weakref.hxx> #endif +#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ +#include <com/sun/star/mozilla/MozillaProductType.hpp> +#endif namespace connectivity { @@ -106,10 +109,11 @@ namespace SDBCAddress { typedef enum { Unknown = 0, - LDAP = 1, - Outlook = 2, - Mozilla = 3, - OutlookExp = 4 + Mozilla = 1, + ThunderBird = 2, + LDAP = 3, + Outlook = 4, + OutlookExp = 5 } sdbc_address_type; } @@ -146,7 +150,6 @@ ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - ::rtl::OUString m_sUser; // the user name MozabDriver* m_pDriver; // Pointer to the owning // driver object // Store Catalog @@ -154,13 +157,17 @@ // Start of Additions from the land of mozilla OColumnAlias m_aColumnAlias; rtl::OUString m_sMozillaURI; - sal_Int32 m_nAnonABCount; + rtl::OUString m_sMozillaProfile; sal_Int32 m_nMaxResultRecords; + MNameMapper* m_aNameMapper; + //LDAP only + rtl::OUString m_sHostName; sal_Bool m_bUseSSL; rtl::OUString m_sBindDN; + rtl::OUString m_sUser; // the user name rtl::OUString m_sPassword; - rtl::OUString m_sHostName; - MNameMapper* m_aNameMapper; + + SDBCAddress::sdbc_address_type m_eSDBCAddressType; @@ -213,8 +220,17 @@ // Additions from the land of mozilla - rtl::OUString getMozURI() const - { return m_sMozillaURI; } + rtl::OUString getMozURI() const { return m_sMozillaURI; } + rtl::OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + + ::com::sun::star::mozilla::MozillaProductType getProduct() + { + if (m_eSDBCAddressType == SDBCAddress::ThunderBird) + return ::com::sun::star::mozilla::MozillaProductType_Thunderbird; + return ::com::sun::star::mozilla::MozillaProductType_Mozilla; + } + // Get Ldap BindDN (user name) rtl::OUString getBindDN() const { return m_sBindDN; } // Get Ldap Password @@ -226,17 +242,17 @@ sal_Bool usesFactory(void) const { return (m_eSDBCAddressType == SDBCAddress::Outlook) || (m_eSDBCAddressType == SDBCAddress::OutlookExp); } sal_Bool isLDAP(void) const { return m_eSDBCAddressType == SDBCAddress::LDAP; } + sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} - sal_Int32 getNextAnonymousAB() { return (++m_nAnonABCount); } sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} - const OColumnAlias & getColumnAlias() const - { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } static const sal_Char* getSDBC_SCHEME_MOZILLA(); + static const sal_Char* getSDBC_SCHEME_THUNDERBIRD(); static const sal_Char* getSDBC_SCHEME_LDAP(); static const sal_Char* getSDBC_SCHEME_OUTLOOK_MAPI(); static const sal_Char* getSDBC_SCHEME_OUTLOOK_EXPRESS(); @@ -245,7 +261,6 @@ MNameMapper* getNameMapper(); void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;} sal_Bool getForceLoadTables() { return m_bForceLoadTable;} - // End of Additions from the land of mozilla }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
