Tag: cws_dev300_odbmacros3 User: fs Date: 2008-07-29 08:23:47+0000 Modified: dba/dbaccess/source/core/dataaccess/datasource.cxx
Log: #i76128# moved the InitState handling from ModelImpl to the DatabaseDocument, as it really only affects the latter 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.4.3&r2=1.79.4.4 Delta lines: +4 -4 ------------------- --- datasource.cxx 2008-07-29 07:10:06+0000 1.79.4.3 +++ datasource.cxx 2008-07-29 08:23:45+0000 1.79.4.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: datasource.cxx,v $ - * $Revision: 1.79.4.3 $ + * $Revision: 1.79.4.4 $ * * This file is part of OpenOffice.org. * @@ -1365,7 +1365,7 @@ //------------------------------------------------------------------------------ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException) { - ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit ); + ModelMethodGuard aGuard( *this ); Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions; if ( !xContainer.is() ) @@ -1381,7 +1381,7 @@ //------------------------------------------------------------------------------ Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException ) { - ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit ); + ModelMethodGuard aGuard( *this ); Reference< XNameAccess > xContainer = m_pImpl->m_xTableDefinitions; if ( !xContainer.is() ) @@ -1489,7 +1489,7 @@ // XDocumentDataSource Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException) { - ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodWithoutInit ); + ModelMethodGuard aGuard( *this ); Reference< XModel > xModel( m_pImpl->getModel_noCreate() ); if ( !xModel.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
