Tag: cws_src680_dba24 User: oj Date: 05/02/21 05:12:05 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: RESYNC: (1.8-1.9); 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.8.4.2&r2=1.8.4.3 Delta lines: +11 -10 --------------------- --- dbwizsetup.cxx 18 Feb 2005 12:42:24 -0000 1.8.4.2 +++ dbwizsetup.cxx 21 Feb 2005 13:12:02 -0000 1.8.4.3 @@ -984,18 +984,15 @@ aArgs[nLen].Value <<= xHandler; } xStore->storeAsURL(sPath,aArgs); - xComponent->dispose(); + if (pFinalPage != NULL) { if (pFinalPage->IsDatabaseDocumentToBeRegistered()) RegisterDataSourceByLocation(sPath); - if (pFinalPage->IsDatabaseDocumentToBeOpened()) - OpenDatabaseDocument(sPath); } else { RegisterDataSourceByLocation(sPath); - OpenDatabaseDocument(sPath); } return sal_True; } @@ -1015,8 +1012,16 @@ } return sal_False; } - - +// ----------------------------------------------------------------------------- +sal_Bool ODbTypeWizDialogSetup::IsDatabaseDocumentToBeOpened() +{ + return (pFinalPage != NULL) ? pFinalPage->IsDatabaseDocumentToBeOpened() : sal_True; +} +// ----------------------------------------------------------------------------- +sal_Bool ODbTypeWizDialogSetup::IsTableWizardToBeStarted() +{ + return (pFinalPage != NULL) && pFinalPage->IsTableWizardToBeStarted(); +} //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::CreateDatabase() { @@ -1082,10 +1087,6 @@ short ODbTypeWizDialogSetup::Execute() { short nResult = ModalDialog::Execute(); - - if ( RET_OK == nResult && pFinalPage != NULL && pFinalPage->IsTableWizardToBeStarted() ) - StartTableWizard(); - return nResult; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
