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

1 files changed, 31 insertions, 16 deletions

diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 05f76205a3a3..66f528c37012 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MConnection.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: hjs $ $Date: 2004-06-25 18:27:40 $
+ *  last change: $Author: vg $ $Date: 2005-02-21 12:21:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -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 connectivity
         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 @@ namespace connectivity
 
             ::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 @@ namespace connectivity
             // 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 @@ namespace connectivity
 
 
             // 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 @@ namespace connectivity
 
             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();
@@ -246,7 +262,6 @@ namespace connectivity
             void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;}
             sal_Bool getForceLoadTables() { return m_bForceLoadTable;}
 
-
             // End of Additions from the land of mozilla
         };
     }