User: ihi Date: 2007-11-21 15:32:33+0000 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx
Log: INTEGRATION: CWS dba24c (1.93.22); FILE MERGED 2007/09/18 12:55:06 fs 1.93.22.1: during #i81095#: moved from XMultiServiceFactory to ::comphelper::ComponentContext File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.93&r2=1.94 Delta lines: +17 -15 --------------------- --- RowSetBase.cxx 2007-07-24 12:03:50+0000 1.93 +++ RowSetBase.cxx 2007-11-21 15:32:31+0000 1.94 @@ -134,21 +134,23 @@ // ========================================================================= DBG_NAME(ORowSetBase) // ------------------------------------------------------------------------- -ORowSetBase::ORowSetBase(::cppu::OBroadcastHelper &_rBHelper,::osl::Mutex* _pMutex) - : OPropertyStateContainer(_rBHelper) - , m_pMutex(_pMutex) - , m_pCache(NULL) - , m_pColumns(NULL) - , m_rBHelper(_rBHelper) - , m_pEmptyCollection( NULL ) - , m_nLastColumnIndex(-1) - , m_nDeletedPosition(-1) - , m_nResultSetType( ResultSetType::FORWARD_ONLY ) - , m_nResultSetConcurrency( ResultSetConcurrency::READ_ONLY ) - , m_bClone(sal_False) - , m_bIgnoreResult(sal_False) - , m_bBeforeFirst(sal_True) // changed from sal_False - , m_bAfterLast(sal_False) +ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex ) + :OPropertyStateContainer(_rBHelper) + ,m_pMutex(_pMutex) + ,m_pCache(NULL) + ,m_pColumns(NULL) + ,m_rBHelper(_rBHelper) + ,m_pEmptyCollection( NULL ) + ,m_aContext( _rContext ) + ,m_aErrors( _rContext ) + ,m_nLastColumnIndex(-1) + ,m_nDeletedPosition(-1) + ,m_nResultSetType( ResultSetType::FORWARD_ONLY ) + ,m_nResultSetConcurrency( ResultSetConcurrency::READ_ONLY ) + ,m_bClone(sal_False) + ,m_bIgnoreResult(sal_False) + ,m_bBeforeFirst(sal_True) // changed from sal_False + ,m_bAfterLast(sal_False) { DBG_CTOR(ORowSetBase,NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
