User: ihi Date: 2007-11-21 15:35:43+0000 Modified: dba/dbaccess/source/core/dataaccess/ContentHelper.cxx
Log: INTEGRATION: CWS dba24c (1.9.44); FILE MERGED 2007/09/20 18:33:06 fs 1.9.44.1: during #i80856#: m_xORB -> m_aContext File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ContentHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ContentHelper.cxx?r1=1.9&r2=1.10 Delta lines: +4 -3 ------------------- --- ContentHelper.cxx 2007-06-05 14:39:09+0000 1.9 +++ ContentHelper.cxx 2007-11-21 15:35:41+0000 1.10 @@ -119,7 +119,8 @@ ,m_aContentListeners(m_aMutex) ,m_aPropertyChangeListeners(m_aMutex) ,m_xParentContainer(_xParentContainer) - ,m_xORB(_xORB) + ,m_aContext( _xORB ) + ,m_aErrorHelper( m_aContext ) ,m_pImpl(_pImpl) ,m_nCommandId(0) { @@ -159,7 +160,7 @@ } sContentId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:")) + sContentId; - return new ::ucbhelper::ContentIdentifier(m_xORB,sContentId); + return new ::ucbhelper::ContentIdentifier( m_aContext.getLegacyServiceFactory(), sContentId ); // return Reference< XContentIdentifier >(); } // ----------------------------------------------------------------------------- @@ -481,7 +482,7 @@ { // Note: Empty sequence means "get values of all supported properties". - rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( m_xORB ); + rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( m_aContext.getLegacyServiceFactory() ); sal_Int32 nCount = rProperties.getLength(); if ( nCount ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
