User: hr      
Date: 06/06/19 18:42:03

Modified:
 /dba/connectivity/source/drivers/mozab/
  MConnection.hxx

Log:
 INTEGRATION: CWS warnings01 (1.13.30); FILE MERGED
 2006/04/07 20:22:24 sb 1.13.30.3: RESYNC: (1.13-1.14); FILE MERGED
 2005/11/21 10:07:51 fs 1.13.30.2: #i57457# warning-free code on unx*
 2005/11/07 14:43:44 fs 1.13.30.1: #i57457# warning-free code

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.14&r2=1.15
Delta lines:  +30 -23
---------------------
--- MConnection.hxx     29 Mar 2006 12:17:27 -0000      1.14
+++ MConnection.hxx     20 Jun 2006 01:42:01 -0000      1.15
@@ -96,16 +96,30 @@
                // For the moment, we will connect the Mozilla address book to 
the Mozilla
                // top-level address book which will display whatever is in the 
preferences
                // file of Mozilla.
+        enum MozillaScheme
+        {
                // This one is a base uri which will be completed with the 
connection data.
-               static sal_Char*    MOZ_SCHEME_MOZILLA          = 
"moz-abdirectory://";
+            SCHEME_MOZILLA,
                // This one is for mozilla native address book
-        static sal_Char*    MOZ_SCHEME_MOZILLA_MDB      = 
"moz-abmdbdirectory://";
+            SCHEME_MOZILLA_MDB,
                // This one is for LDAP address book
-        static sal_Char*    MOZ_SCHEME_LDAP             = 
"moz-abldapdirectory://";
+            SCHEME_LDAP,
                // These two uris will be used to obtain directory factories to 
access all
                // address books of the given type.
-        static sal_Char*    MOZ_SCHEME_OUTLOOK_MAPI     = 
"moz-aboutlookdirectory://op/";
-        static sal_Char*    MOZ_SCHEME_OUTLOOK_EXPRESS  = 
"moz-aboutlookdirectory://oe/";
+            SCHEME_OUTLOOK_MAPI,
+            SCHEME_OUTLOOK_EXPRESS
+        };
+        const sal_Char* getSchemeURI( MozillaScheme _eScheme );
+
+        enum SdbcScheme
+        {
+            SDBC_MOZILLA,
+            SDBC_THUNDERBIRD,
+            SDBC_LDAP,
+            SDBC_OUTLOOK_MAPI,
+            SDBC_OUTLOOK_EXPRESS
+        };
+        const sal_Char* getSdbcScheme( SdbcScheme _eScheme );
 
                typedef connectivity::OMetaConnection                           
OConnection_BASE; // implements basics and text encoding
 
@@ -148,8 +162,6 @@
                        rtl::OUString   m_sUser;                // the user name
             rtl::OUString   m_sPassword;
 
-
-
                        SDBCAddress::sdbc_address_type  m_eSDBCAddressType;
 
                        sal_Bool        m_bForceLoadTable;
@@ -234,11 +246,6 @@
 
             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();
                        static ::rtl::OUString    getDriverImplementationName();
 
                        MNameMapper* getNameMapper();




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to