User: ihi Date: 2007-11-21 15:38:01+0000 Modified: dba/dbaccess/source/core/dataaccess/datasource.cxx
Log: INTEGRATION: CWS dba24c (1.73.22); FILE MERGED 2007/10/22 21:00:04 fs 1.73.22.1: during #i73705# #i52527#: ODatabaseModelImpl::m_aContainer not publicly accessible anymore 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.73&r2=1.74 Delta lines: +4 -10 -------------------- --- datasource.cxx 2007-07-24 12:05:01+0000 1.73 +++ datasource.cxx 2007-11-21 15:37:59+0000 1.74 @@ -1377,11 +1377,8 @@ Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions; if ( !xContainer.is() ) { - if ( !m_pImpl->m_aContainer[ODatabaseModelImpl::E_QUERY].get() ) - { - m_pImpl->m_aContainer[ODatabaseModelImpl::E_QUERY] = TContentPtr(new ODefinitionContainer_Impl); - } - xContainer = new OCommandContainer(m_pImpl->m_xServiceFactory,*this,m_pImpl->m_aContainer[ODatabaseModelImpl::E_QUERY],sal_False); + TContentPtr& rContainerData( m_pImpl->getObjectContainer( ODatabaseModelImpl::E_QUERY ) ); + xContainer = new OCommandContainer( m_pImpl->m_xServiceFactory, *this, rContainerData, sal_False ); m_pImpl->m_xCommandDefinitions = xContainer; } return xContainer; @@ -1396,11 +1393,8 @@ Reference< XNameAccess > xContainer = m_pImpl->m_xTableDefinitions; if ( !xContainer.is() ) { - if ( !m_pImpl->m_aContainer[ODatabaseModelImpl::E_TABLE].get() ) - { - m_pImpl->m_aContainer[ODatabaseModelImpl::E_TABLE] = TContentPtr(new ODefinitionContainer_Impl); - } - xContainer = new OCommandContainer( m_pImpl->m_xServiceFactory, *this, m_pImpl->m_aContainer[ODatabaseModelImpl::E_TABLE], sal_True); + TContentPtr& rContainerData( m_pImpl->getObjectContainer( ODatabaseModelImpl::E_TABLE ) ); + xContainer = new OCommandContainer( m_pImpl->m_xServiceFactory, *this, rContainerData, sal_True ); m_pImpl->m_xTableDefinitions = xContainer; } return xContainer; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
