User: kz Date: 05/06/30 09:32:45 Modified: /dba/dbaccess/source/ui/dlg/ dbwiz.cxx
Log: INTEGRATION: CWS wizopendb (1.6.48); FILE MERGED 2005/06/06 10:40:41 fs 1.6.48.1: #i42477# allow the 'New Database' wizard to load existing documents 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.6&r2=1.7 Delta lines: +7 -3 ------------------- --- dbwiz.cxx 10 Mar 2005 16:49:19 -0000 1.6 +++ dbwiz.cxx 30 Jun 2005 16:32:42 -0000 1.7 @@ -168,7 +168,7 @@ { DBG_CTOR(ODbTypeWizDialog,NULL); m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); - m_pImpl->setCurrentDataSourceName(_aDataSourceName); + m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); @@ -357,9 +357,13 @@ switch(_nState) { case START_PAGE: // start state + { pPage = OGeneralPage::Create(this,*m_pOutSet); - static_cast<OGeneralPage*>(pPage)->SetTypeSelectHandler(LINK(this, ODbTypeWizDialog, OnTypeSelected)); + OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage ); + pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected)); +// pGeneralPage->SetCreationModeHandler( LINK( this, ODbTypeWizDialog, TODO ) ); nStringId = STR_PAGETITLE_GENERAL; + } break; case CONNECTION_PAGE: pPage = OConnectionTabPage::Create(this,*m_pOutSet); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
