Tag: cws_dev300_odbmacros3 User: fs Date: 2008-07-23 10:04:49+0000 Modified: dba/dbaccess/source/core/dataaccess/datasource.cxx
Log: #i76128# support for XLoadable at the database document File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.79&r2=1.79.4.1 Delta lines: +8 -8 ------------------- --- datasource.cxx 2008-06-25 12:32:03+0000 1.79 +++ datasource.cxx 2008-07-23 10:04:46+0000 1.79.4.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: datasource.cxx,v $ - * $Revision: 1.79 $ + * $Revision: 1.79.4.1 $ * * This file is part of OpenOffice.org. * @@ -1365,7 +1365,7 @@ //------------------------------------------------------------------------------ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException) { - ModelMethodGuard aGuard( *this ); + ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit ); Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions; if ( !xContainer.is() ) @@ -1381,7 +1381,7 @@ //------------------------------------------------------------------------------ Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException ) { - ModelMethodGuard aGuard( *this ); + ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit ); Reference< XNameAccess > xContainer = m_pImpl->m_xTableDefinitions; if ( !xContainer.is() ) @@ -1404,7 +1404,7 @@ SharedModel xModel( m_pImpl->getModel_noCreate(), SharedModel::NoTakeOwnership ); if ( !xModel.is() ) - xModel.reset( m_pImpl->createNewModel_deliverOwnership(), SharedModel::TakeOwnership ); + xModel.reset( m_pImpl->createNewModel_deliverOwnership( false ), SharedModel::TakeOwnership ); Reference< css::frame::XStorable> xStorable( xModel, UNO_QUERY_THROW ); xStorable->store(); @@ -1487,13 +1487,13 @@ // XDocumentDataSource Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException) { - ModelMethodGuard aGuard( *this ); + ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit ); Reference< XModel > xModel( m_pImpl->getModel_noCreate() ); if ( !xModel.is() ) - xModel = m_pImpl->createNewModel_deliverOwnership(); + xModel = m_pImpl->createNewModel_deliverOwnership( true ); - return Reference< XOfficeDatabaseDocument >( xModel, UNO_QUERY ); + return Reference< XOfficeDatabaseDocument >( xModel, UNO_QUERY_THROW ); } // ----------------------------------------------------------------------------- Reference< XInterface > ODatabaseSource::getThis() const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
