Tag: cws_src680_dba24
User: oj      
Date: 05/03/08 02:20:05

Modified:
 /dba/dbaccess/source/ui/dlg/
  dbwizsetup.cxx

Log:
 RESYNC: (1.9-1.10); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: dbwizsetup.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.8.4.5&r2=1.8.4.6
Delta lines:  +20 -8
--------------------
--- dbwizsetup.cxx      28 Feb 2005 08:12:17 -0000      1.8.4.5
+++ dbwizsetup.cxx      8 Mar 2005 10:20:03 -0000       1.8.4.6
@@ -244,8 +244,9 @@
 #define PAGE_DBSETUPWIZARD_ODBC                      12
 #define PAGE_DBSETUPWIZARD_SPREADSHEET               13
 #define PAGE_DBSETUPWIZARD_AUTHENTIFICATION          14
-#define PAGE_DBSETUPWIZARD_FINAL                     15
-#define PAGE_DBSETUPWIZARD_USERDEFINED               16
+#define PAGE_DBSETUPWIZARD_MOZILLA                   15
+#define PAGE_DBSETUPWIZARD_FINAL                     16
+#define PAGE_DBSETUPWIZARD_USERDEFINED               17
 
 
 #define DBASE_PATH             1
@@ -264,8 +265,9 @@
 #define OUTLOOK_PATH           14
 #define MOZILLA_PATH           15
 #define EVOLUTION_PATH         16
-#define CREATENEW_PATH         17
-#define USERDEFINED_PATH       18
+#define THUNDERBIRD_PATH       17
+#define CREATENEW_PATH         18
+#define USERDEFINED_PATH       19
 
 OFinalDBPageSetup*          pFinalPage;
 
@@ -404,6 +406,11 @@
     else
         declarePath( MOZILLA_PATH, PAGE_DBSETUPWIZARD_INTRO, 
PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
     
+    if ( m_pCollection->hasAuthentication(DST_THUNDERBIRD))
+        declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, 
WZS_INVALID_STATE);
+    else
+        declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, 
PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+
     if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
         declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, 
WZS_INVALID_STATE);
     else
@@ -584,6 +591,10 @@
                 activatePath( MOZILLA_PATH, sal_True);
                            break;
 
+            case DST_THUNDERBIRD:
+                activatePath( THUNDERBIRD_PATH, sal_True);
+                           break;
+
             case DST_EVOLUTION:
                 activatePath( EVOLUTION_PATH, sal_True);
                 break;
@@ -635,6 +646,7 @@
         case DST_OUTLOOK:
         case DST_OUTLOOKEXP:
         case DST_MOZILLA:
+               case DST_THUNDERBIRD:
             return sal_False;
             break;
         default:




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

Reply via email to