User: ihi Date: 2007-09-13 17:58:57+0000 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: INTEGRATION: CWS macaddressbook01 (1.25.24); FILE MERGED 2007/07/09 23:20:29 ericb 1.25.24.2: RESYNC: (1.25-1.26); FILE MERGED 2007/07/08 19:08:13 msicotte 1.25.24.1: #i77591# initial commit 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.26&r2=1.27 Delta lines: +12 -4 -------------------- --- dbwizsetup.cxx 2007-07-06 08:14:46+0000 1.26 +++ dbwizsetup.cxx 2007-09-13 17:58:54+0000 1.27 @@ -261,10 +261,11 @@ #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 +#define MACAB_PATH 20 +#define THUNDERBIRD_PATH 21 +#define CREATENEW_PATH 22 +#define USERDEFINED_PATH 23 +#define OPEN_DOC_PATH 24 OFinalDBPageSetup* pFinalPage; @@ -432,6 +433,11 @@ else declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_MACAB)) + declarePath( MACAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( MACAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(m_pCollection->getEmbeddedDatabaseType(getORB()))) declarePath( CREATENEW_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -576,6 +582,7 @@ { DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE }, { DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP }, { DST_KAB, KAB_PATH }, + { DST_MACAB, MACAB_PATH }, { DST_USERDEFINE1, USERDEFINED_PATH }, { DST_USERDEFINE2, USERDEFINED_PATH }, { DST_USERDEFINE3, USERDEFINED_PATH }, @@ -646,6 +653,7 @@ switch ( m_eType ) { case DST_KAB: + case DST_MACAB: case DST_EVOLUTION: case DST_EVOLUTION_GROUPWISE: case DST_EVOLUTION_LDAP: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
