User: obo Date: 2006/07/10 08:08:56 Modified: dba/dbaccess/source/core/dataaccess/commandcontainer.cxx
Log: INTEGRATION: CWS qiq (1.11.124); FILE MERGED 2006/06/27 12:01:02 fs 1.11.124.3: RESYNC: (1.11-1.12); FILE MERGED 2006/06/16 11:47:38 fs 1.11.124.2: during #i51143#: refactored VCollection: - createEmptyObject now named createDescriptor - cloneObject removed - appendObject now returns the newly created object (previously done via a subsequent call to cloneObject) 2006/05/24 14:57:33 fs 1.11.124.1: #i51143# File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: commandcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/commandcontainer.cxx?r1=1.12&r2=1.13 Delta lines: +7 -4 ------------------- --- commandcontainer.cxx 20 Jun 2006 02:43:50 -0000 1.12 +++ commandcontainer.cxx 10 Jul 2006 15:08:54 -0000 1.13 @@ -87,22 +87,25 @@ //-------------------------------------------------------------------------- Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _rName) { - ODefinitionContainer_Impl* pItem = static_cast<ODefinitionContainer_Impl*>(m_pImpl.get()); - OSL_ENSURE(pItem->m_aDocumentMap.find(_rName) != pItem->m_aDocumentMap.end() ," Invalid entry in map!"); + const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); + OSL_ENSURE( rDefinitions.find(_rName) != rDefinitions.end(), "OCommandContainer::createObject: Invalid entry in map!" ); if ( m_bTables ) - return new OComponentDefinition(*this, _rName,m_xORB,pItem->m_aDocumentMap.find(_rName)->second,m_bTables); - return new OCommandDefinition(*this, _rName,m_xORB,pItem->m_aDocumentMap.find(_rName)->second); + return new OComponentDefinition( *this, _rName, m_xORB, rDefinitions.find( _rName )->second, m_bTables ); + return new OCommandDefinition( *this, _rName, m_xORB, rDefinitions.find( _rName )->second ); } + // ----------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException) { return createInstance( ); } + // ----------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exception, RuntimeException) { return m_xORB->createInstance(m_bTables ? SERVICE_SDB_TABLEDEFINITION : SERVICE_SDB_COMMAND_DEFINITION); } + //........................................................................ } // namespace dbaccess //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
