Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:52:19 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: RESYNC: (1.15-1.16); 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.15.24.1&r2=1.15.24.2 Delta lines: +40 -24 --------------------- --- dbwizsetup.cxx 24 Mar 2006 15:36:11 -0000 1.15.24.1 +++ dbwizsetup.cxx 7 Apr 2006 20:52:16 -0000 1.15.24.2 @@ -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; @@ -399,6 +401,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 @@ -545,6 +557,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 }, @@ -617,6 +631,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]
