User: vg Date: 05/02/21 04:43:42 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: INTEGRATION: CWS mozab05 (1.3.6); FILE MERGED 2005/02/01 01:50:30 windly 1.3.6.5: #10000# fix a resync conflict 2005/01/31 08:19:02 windly 1.3.6.4: RESYNC: (1.7-1.8); FILE MERGED 2005/01/17 07:54:37 windly 1.3.6.3: RESYNC: (1.3-1.7); FILE MERGED 2005/01/14 10:39:06 windly 1.3.6.2: #i20088# add browse support 2004/12/03 10:26:01 windly 1.3.6.1: #i20088# add ThunderBird address book type to database wizward 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.9&r2=1.10 Delta lines: +17 -5 -------------------- --- dbwizsetup.cxx 17 Feb 2005 11:07:45 -0000 1.9 +++ dbwizsetup.cxx 21 Feb 2005 12:43:39 -0000 1.10 @@ -240,8 +240,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 @@ -260,8 +261,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; @@ -403,6 +405,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 @@ -583,6 +590,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; @@ -634,6 +645,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]
