User: hr Date: 06/01/25 07:11:15 Modified: /dba/dbaccess/source/core/api/ RowSetCacheIterator.cxx
Log: INTEGRATION: CWS rowsetdel (1.9.72); FILE MERGED 2006/01/25 14:53:46 fs 1.9.72.2: manual RESYNC to HEAD 2006/01/19 09:04:09 fs 1.9.72.1: merging the changes from CWS stlusagefix01, to ensure there are no interdependencies File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCacheIterator.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCacheIterator.cxx?r1=1.11&r2=1.12 Delta lines: +3 -3 ------------------- --- RowSetCacheIterator.cxx 25 Jan 2006 13:43:56 -0000 1.11 +++ RowSetCacheIterator.cxx 25 Jan 2006 15:11:12 -0000 1.12 @@ -81,7 +81,7 @@ // ----------------------------------------------------------------------------- const ORowSetRow& ORowSetCacheIterator::operator *() const { - if ( !m_pRowSet->isInsertRow(ORowSetBase::GrantNotifierAccess()) && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() ) + if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() ) { OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!"); m_pCache->moveToBookmark(m_aIter->second.aBookmark); @@ -97,7 +97,7 @@ // ----------------------------------------------------------------------------- const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const { - if ( !m_pRowSet->isInsertRow(ORowSetBase::GrantNotifierAccess()) && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() ) + if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() ) { OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!"); m_pCache->moveToBookmark(m_aIter->second.aBookmark); @@ -132,7 +132,7 @@ if ( !bRet ) { ORowSetCacheIterator_Helper aHelper = m_aIter->second; - bRet = ( m_pRowSet->isInsertRow(ORowSetBase::GrantNotifierAccess()) + bRet = ( m_pRowSet->isInsertRow() ? m_aIter->second.aIterator == m_pCache->m_pInsertMatrix->end() : --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
