User: rt Date: 2006/07/26 00:46:38 Modified: dba/dbaccess/source/core/api/RowSetCacheIterator.cxx
Log: INTEGRATION: CWS dba204b (1.14.12); FILE MERGED 2006/07/10 07:59:47 oj 1.14.12.1: #i64770# rotate end as well, and removed some warnings plus extra debug code 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.14&r2=1.15 Delta lines: +7 -2 ------------------- --- RowSetCacheIterator.cxx 20 Jun 2006 02:36:52 -0000 1.14 +++ RowSetCacheIterator.cxx 26 Jul 2006 07:46:36 -0000 1.15 @@ -84,7 +84,7 @@ 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); + OSL_VERIFY(m_pCache->moveToBookmark(m_aIter->second.aBookmark)); m_aIter->second.aIterator = m_pCache->m_aMatrixIter; } return *m_aIter->second.aIterator; @@ -100,7 +100,7 @@ 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); + OSL_VERIFY(m_pCache->moveToBookmark(m_aIter->second.aBookmark)); m_aIter->second.aIterator = m_pCache->m_aMatrixIter; } return m_aIter->second.aIterator; @@ -109,6 +109,11 @@ bool ORowSetCacheIterator::operator <=(const ORowSetMatrix::iterator& _rRH) const { return m_aIter->second.aIterator <= _rRH; +} +// ----------------------------------------------------------------------------- +bool ORowSetCacheIterator::operator <(const ORowSetMatrix::iterator& _rRH) const +{ + return m_aIter->second.aIterator < _rRH; } // ----------------------------------------------------------------------------- bool ORowSetCacheIterator::operator !=(const ORowSetMatrix::iterator& _rRH) const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
