User: rt Date: 05/09/05 01:58:10 Modified: /dba/dbaccess/source/core/api/ RowSetCacheIterator.cxx
Log: INTEGRATION: CWS hr18 (1.7.462); FILE MERGED 2005/08/10 16:45:22 hr 1.7.462.1: #i51878#,#i53108#: cleanup STL iterator usage 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.7&r2=1.8 Delta lines: +10 -13 --------------------- --- RowSetCacheIterator.cxx 13 Nov 2002 06:56:59 -0000 1.7 +++ RowSetCacheIterator.cxx 5 Sep 2005 08:58:08 -0000 1.8 @@ -74,8 +74,7 @@ // ----------------------------------------------------------------------------- ORowSetCacheIterator::operator ORowSetMatrix::iterator() { - if(m_aIter->second.aIterator == NULL || - m_aIter->second.aIterator == m_pCache->m_pMatrix->end()) + if ( 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); @@ -108,8 +107,7 @@ // ----------------------------------------------------------------------------- const ORowSetRow& ORowSetCacheIterator::operator *() const { - if(m_aIter->second.aIterator == NULL || - m_aIter->second.aIterator == m_pCache->m_pMatrix->end()) + if ( 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); @@ -125,8 +123,7 @@ // ----------------------------------------------------------------------------- const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const { - if(m_aIter->second.aIterator == NULL || - m_aIter->second.aIterator == m_pCache->m_pMatrix->end()) + if ( 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); @@ -155,7 +152,7 @@ m_aIter->second.aBookmark = _rBookmark; } // ----------------------------------------------------------------------------- - - - - +sal_Bool ORowSetCacheIterator::isNull() const +{ + return !m_pCache || m_aIter == m_pCache->m_aCacheIterators.end() || m_aIter->second.aIterator == m_pCache->m_pMatrix->end(); +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
