User: rt Date: 2008-06-06 14:01:48+0000 Modified: dba/dbaccess/source/core/dataaccess/databasecontext.cxx
Log: INTEGRATION: CWS dba30c (1.38.16); FILE MERGED 2008/05/13 06:11:59 fs 1.38.16.5: #i10000# post-resync 2008/05/09 08:24:03 oj 1.38.16.4: RESYNC: (1.39-1.41); FILE MERGED 2008/05/08 13:14:00 fs 1.38.16.3: #i87741# when newly creating a database document to be loaded, then pass an interaction handler and a macro execution mode of USE_CONFIG 2008/04/16 06:51:25 fs 1.38.16.2: RESYNC: (1.38-1.39); FILE MERGED 2008/04/12 20:22:51 fs 1.38.16.1: #i88201# File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasecontext.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.cxx?r1=1.41&r2=1.42 Delta lines: +3 -3 ------------------- --- databasecontext.cxx 2008-05-05 16:31:31+0000 1.41 +++ databasecontext.cxx 2008-06-06 14:01:45+0000 1.42 @@ -341,7 +341,7 @@ Reference< XModel > xModel = pExistent->createNewModel_deliverOwnership(); DBG_ASSERT( xModel.is(), "ODatabaseContext::loadObjectFromURL: no model?" ); - // calls registerPrivate in attachResource + xModel->attachResource( _sURL, aArgs.getPropertyValues() ); ::utl::CloseableComponent aEnsureClose( xModel ); @@ -349,7 +349,7 @@ setTransientProperties( _sURL, *pExistent ); - return pExistent->getDataSource(); + return pExistent->getDataSource().get(); } // ----------------------------------------------------------------------------- void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
