User: kz Date: 2008-03-06 18:18:44+0000 Modified: dba/dbaccess/source/ui/dlg/dbwiz.cxx
Log: INTEGRATION: CWS odbmacros2 (1.18.2); FILE MERGED 2008/01/15 09:50:00 fs 1.18.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]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.19&r2=1.20 Delta lines: +5 -4 ------------------- --- dbwiz.cxx 2008-03-05 16:58:22+0000 1.19 +++ dbwiz.cxx 2008-03-06 18:18:41+0000 1.20 @@ -131,7 +131,7 @@ ,const Reference< XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ) - :OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP, sal_True) + :OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ) ,m_pOutSet(NULL) ,m_bResetting(sal_False) ,m_bApplied(sal_False) @@ -150,6 +150,7 @@ ShowButtonFixedLine(sal_True); defaultButton(WZB_NEXT); enableButtons(WZB_FINISH, sal_False); + enableAutomaticNextButtonState( true ); m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); @@ -190,7 +191,7 @@ return 1L; } //------------------------------------------------------------------------- -WizardTypes::WizardState ODbTypeWizDialog::determineNextState(WizardState _nCurrentState) +WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const { WizardTypes::WizardState nNextState = WZS_INVALID_STATE; switch(_nCurrentState) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
