User: rt Date: 06/05/04 01:39:41 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: INTEGRATION: CWS dba203c (1.18.4); FILE MERGED 2006/04/28 07:49:40 oj 1.18.4.2: #i63434# set args even at a new database 2006/04/13 14:12:19 oj 1.18.4.1: #i63434# set args even at a new database File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.18&r2=1.19 Delta lines: +10 -5 -------------------- --- dbloader2.cxx 24 Mar 2006 13:02:11 -0000 1.18 +++ dbloader2.cxx 4 May 2006 08:39:39 -0000 1.19 @@ -527,13 +527,18 @@ Reference< XDocumentDataSource > xDocumentDataSource; xDocumentDataSource.set(xDatabaseContext->createInstanceWithArguments(aCreationArgs),UNO_QUERY_THROW); xModel.set(xDocumentDataSource->getDatabaseDocument(),UNO_QUERY); - - if ( bInteractive && xModel.is() ) + if ( xModel.is() ) { ::rtl::OUString sURL = xModel->getURL(); + if ( bCreateNew ) + xModel->attachResource( sURL, aLoadArgs ); + + if ( bInteractive ) + { bSuccess = impl_executeNewDatabaseWizard( xModel, bStartTableWizard ); if ( sURL != xModel->getURL() ) bDidLoadExisting = sal_True; + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
