User: kz Date: 06/02/28 02:36:27 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: INTEGRATION: CWS evo2fixes (1.15.40); FILE MERGED 2006/02/20 13:04:30 mmeeks 1.15.40.1: Issue number: i#62138# Submitted by: mmeeks Reviewed by: fr Add Evo G/W, LDAP backends to UI. 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.15&r2=1.16 Delta lines: +37 -21 --------------------- --- dbwizsetup.cxx 21 Dec 2005 13:36:41 -0000 1.15 +++ dbwizsetup.cxx 28 Feb 2006 10:36:25 -0000 1.16 @@ -242,11 +242,13 @@ #define OUTLOOK_PATH 14 #define MOZILLA_PATH 15 #define EVOLUTION_PATH 16 -#define KAB_PATH 17 -#define THUNDERBIRD_PATH 18 -#define CREATENEW_PATH 19 -#define USERDEFINED_PATH 20 -#define OPEN_DOC_PATH 21 +#define EVOLUTION_PATH_GROUPWISE 17 +#define EVOLUTION_PATH_LDAP 18 +#define KAB_PATH 19 +#define THUNDERBIRD_PATH 20 +#define CREATENEW_PATH 21 +#define USERDEFINED_PATH 22 +#define OPEN_DOC_PATH 23 OFinalDBPageSetup* pFinalPage; @@ -394,6 +396,16 @@ else declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_EVOLUTION_GROUPWISE)) + declarePath( EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + + if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP)) + declarePath( EVOLUTION_PATH_LDAP, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( EVOLUTION_PATH_LDAP, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_KAB)) declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -540,6 +552,8 @@ { DST_MOZILLA, MOZILLA_PATH }, { DST_THUNDERBIRD, THUNDERBIRD_PATH }, { DST_EVOLUTION, EVOLUTION_PATH }, + { DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE }, + { DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP }, { DST_KAB, KAB_PATH }, { DST_USERDEFINE1, USERDEFINED_PATH }, { DST_USERDEFINE2, USERDEFINED_PATH }, @@ -613,6 +627,8 @@ { case DST_KAB: case DST_EVOLUTION: + case DST_EVOLUTION_GROUPWISE: + case DST_EVOLUTION_LDAP: case DST_OUTLOOK: case DST_OUTLOOKEXP: case DST_MOZILLA: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
