User: ihi Date: 2007-11-21 15:34:11+0000 Modified: dba/dbaccess/source/core/api/querycontainer.cxx
Log: INTEGRATION: CWS dba24c (1.25.142); FILE MERGED 2007/09/20 18:32:27 fs 1.25.142.1: during #i80856#: m_xORB -> m_aContext File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: querycontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querycontainer.cxx?r1=1.25&r2=1.26 Delta lines: +3 -3 ------------------- --- querycontainer.cxx 2006-09-17 06:35:30+0000 1.25 +++ querycontainer.cxx 2007-11-21 15:34:08+0000 1.26 @@ -213,7 +213,7 @@ throw DisposedException( ::rtl::OUString(), *this ); // first clone this object's CommandDefinition part - Reference< XPropertySet > xCommandDefinitionPart( m_xORB->createInstance( SERVICE_SDB_QUERYDEFINITION ), UNO_QUERY_THROW ); + Reference< XPropertySet > xCommandDefinitionPart( m_aContext.createComponent( (::rtl::OUString)SERVICE_SDB_QUERYDEFINITION ), UNO_QUERY_THROW ); ::comphelper::copyProperties( _rxDesc, xCommandDefinitionPart ); // TODO : the columns part of the descriptor has to be copied @@ -406,11 +406,11 @@ Reference< XContent > xReturn; if ( xContainer .is() ) { - xReturn = new OQueryContainer(xContainer,m_xConnection,m_xORB,m_pWarnings); + xReturn = new OQueryContainer( xContainer, m_xConnection, m_aContext.getLegacyServiceFactory(), m_pWarnings ); } else { - OQuery* pNewObject = new OQuery(Reference<XPropertySet>(_rxCommandDesc,UNO_QUERY), m_xConnection,m_xORB); + OQuery* pNewObject = new OQuery( Reference< XPropertySet >( _rxCommandDesc, UNO_QUERY ), m_xConnection, m_aContext.getLegacyServiceFactory() ); xReturn = pNewObject; pNewObject->setWarningsContainer( m_pWarnings ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
