User: vg Date: 05/02/17 03:07:48 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: INTEGRATION: CWS dba23 (1.7.6); FILE MERGED 2005/02/03 08:14:45 oj 1.7.6.2: RESYNC: (1.7-1.8); FILE MERGED 2005/01/20 16:52:06 oj 1.7.6.1: #i41043# implement private:factory/sdatabase?Interactive 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&r2=1.9 Delta lines: +11 -10 --------------------- --- dbwizsetup.cxx 21 Jan 2005 17:15:01 -0000 1.8 +++ dbwizsetup.cxx 17 Feb 2005 11:07:45 -0000 1.9 @@ -980,18 +980,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; } @@ -1011,8 +1008,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() { @@ -1078,10 +1083,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]
