User: kz Date: 2008-03-06 18:20:01+0000 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: INTEGRATION: CWS odbmacros2 (1.29.2); FILE MERGED 2008/01/15 09:50:00 fs 1.29.2.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133# 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.31&r2=1.32 Delta lines: +5 -4 ------------------- --- dbwizsetup.cxx 2008-03-05 16:59:32+0000 1.31 +++ dbwizsetup.cxx 2008-03-06 18:19:58+0000 1.32 @@ -287,8 +287,7 @@ ,const ::com::sun::star::uno::Any& _aDataSourceName ) :svt::RoadmapWizard( _pParent, ModuleRes(DLG_DATABASE_WIZARD), - WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP, - ModuleRes( STR_ROADMAPHEADER ), sal_True) + WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ) , m_pOutSet(NULL) , m_eType( DST_UNKNOWN ) @@ -340,6 +339,7 @@ ShowButtonFixedLine(sal_True); defaultButton(WZB_NEXT); enableButtons(WZB_FINISH, sal_True); + enableAutomaticNextButtonState(); declareAuthDepPath( DST_ADO, ADO_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_DBASE, DBASE_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_DBASE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); @@ -382,7 +382,7 @@ bool bHasAuthentication = DataSourceMetaData::getAuthentication( _eType ) != AuthNone; // collect the elements of the path - Path aPath; + WizardPath aPath; va_list aStateList; va_start( aStateList, _nFirstState ); @@ -401,7 +401,8 @@ ::svt::RoadmapWizard::declarePath( _nPathId, aPath ); } -String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ){ +String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const +{ String sRoadmapItem; switch( _nState ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
