diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:01:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:01:45 +0000 |
| commit | 3ee40a81297df5611e97cb5ae526cad98a69b870 (patch) | |
| tree | b8f6f7571ee2098503066d28e6b1a8a0b5330f32 /dbaccess | |
| parent | 4ef0f185bdedb33ce6291848c5796a8bb02ae711 (diff) | |
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#
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasecontext.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 27c1eecb2f07..220cee2f75cc 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasecontext.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.42 $ * * This file is part of OpenOffice.org. * @@ -341,7 +341,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin 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 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin setTransientProperties( _sURL, *pExistent ); - return pExistent->getDataSource(); + return pExistent->getDataSource().get(); } // ----------------------------------------------------------------------------- void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel ) |