User: ihi Date: 2007-11-21 15:36:51+0000 Modified: dba/dbaccess/source/core/dataaccess/commandcontainer.cxx
Log: INTEGRATION: CWS dba24c (1.14.142); FILE MERGED 2007/09/20 18:34:05 fs 1.14.142.1: during #i80856#: m_xORB -> m_aContext 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.14&r2=1.15 Delta lines: +5 -3 ------------------- --- commandcontainer.cxx 2006-09-17 06:38:31+0000 1.14 +++ commandcontainer.cxx 2007-11-21 15:36:49+0000 1.15 @@ -92,9 +92,11 @@ { const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); OSL_ENSURE( rDefinitions.find(_rName) != rDefinitions.end(), "OCommandContainer::createObject: Invalid entry in map!" ); + + const TContentPtr& pElementContent( rDefinitions.find( _rName )->second ); if ( m_bTables ) - return new OComponentDefinition( *this, _rName, m_xORB, rDefinitions.find( _rName )->second, m_bTables ); - return new OCommandDefinition( *this, _rName, m_xORB, rDefinitions.find( _rName )->second ); + return new OComponentDefinition( *this, _rName, m_aContext.getLegacyServiceFactory(), pElementContent, m_bTables ); + return new OCommandDefinition( *this, _rName, m_aContext.getLegacyServiceFactory(), pElementContent ); } // ----------------------------------------------------------------------------- @@ -106,7 +108,7 @@ // ----------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exception, RuntimeException) { - return m_xORB->createInstance(m_bTables ? SERVICE_SDB_TABLEDEFINITION : SERVICE_SDB_COMMAND_DEFINITION); + return m_aContext.createComponent( (::rtl::OUString)( m_bTables ? SERVICE_SDB_TABLEDEFINITION : SERVICE_SDB_COMMAND_DEFINITION ) ); } //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
