INTEGRATION: CWS dba04 (1.8.44); FILE MERGED

2003/03/27 11:13:27 fs 1.8.44.2: #96132# use a query proxy for Outlook
2003/03/26 10:37:29 fs 1.8.44.1: #96132# (checkin on behalf of fang fang xia): use a query proxy for Outlook address books if necessary

1 files changed, 19 insertions, 8 deletions

diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index cbf190094f68..8a61c0d591d4 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.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-25 09:07:23 $
+ *  last change: $Author: vg $ $Date: 2003-04-11 14:39:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,15 @@ namespace connectivity
         class ODatabaseMetaData;
         class MNameMapper;
 
+        namespace SDBCAddress {
+            typedef enum {
+                Unknown     = 0,
+                LDAP        = 1,
+                Outlook     = 2,
+                Mozilla     = 3,
+                OutlookExp  = 4
+            } sdbc_address_type;
+        }
 
         typedef connectivity::OMetaConnection               OConnection_BASE; // implements basics and text encoding
 
@@ -133,10 +142,10 @@ namespace connectivity
             rtl::OUString   m_sMozillaURI;
             sal_Int32       m_nAnonABCount;
             sal_Int32       m_nMaxResultRecords;
-            sal_Bool        m_UsesFactory ;
-            sal_Bool        m_IsLDAP ;
-            sal_Bool        m_bOutlookExpress;
             MNameMapper*    m_aNameMapper;
+
+            SDBCAddress::sdbc_address_type  m_eSDBCAddressType;
+
             // End of Additions from the land of mozilla
 
         public:
@@ -191,13 +200,15 @@ namespace connectivity
             rtl::OUString getMozURI() const
                 { return m_sMozillaURI; }
 
-            sal_Bool usesFactory(void) const { return m_UsesFactory ; }
-            sal_Bool isLDAP(void) const { return m_IsLDAP ; }
+            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    isOutlookExpress() const { return m_bOutlookExpress;}
+            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); }