User: rt Date: 2006/07/26 00:46:02 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx
Log: INTEGRATION: CWS dba204b (1.86.12); FILE MERGED 2006/07/14 08:08:56 fs 1.86.12.3: #i10000# 2006/07/13 07:10:44 fs 1.86.12.2: RESYNC: (1.86-1.87); FILE MERGED 2006/07/10 07:59:46 oj 1.86.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]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.87&r2=1.88 Delta lines: +19 -2 -------------------- --- RowSetBase.cxx 10 Jul 2006 15:03:37 -0000 1.87 +++ RowSetBase.cxx 26 Jul 2006 07:45:59 -0000 1.88 @@ -284,8 +284,22 @@ #if OSL_DEBUG_LEVEL > 0 ORowSetMatrix::iterator aCacheEnd = m_pCache->getEnd(); ORowSetMatrix::iterator aCurrentRow = m_aCurrentRow; + ORowSetCacheMap::iterator aCacheIter = m_aCurrentRow.getIter(); + sal_Int32 n = aCacheIter->first; + n = n; + ORowSetCacheIterator_Helper aHelper = aCacheIter->second; + ORowSetMatrix::iterator k = aHelper.aIterator; + for (; k != m_pCache->getEnd(); ++k) + { + ORowSetValueVector* pTemp = k->getBodyPtr(); + OSL_ENSURE( pTemp != (void*)0xfeeefeee,"HALT!" ); + } +#endif + OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); +#if OSL_DEBUG_LEVEL > 0 + ORowSetRow rRow = (*m_aCurrentRow); + OSL_ENSURE(rRow.isValid() && static_cast<sal_uInt16>(columnIndex) < (*rRow).size(),"Invalid size of vector!"); #endif - OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow <= m_pCache->getEnd(),"Invalid iterator set for currentrow!"); return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex]; } @@ -1086,7 +1100,10 @@ OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion"); m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); - +#if OSL_DEBUG_LEVEL > 0 + ORowSetRow rRow = (*m_aCurrentRow); + OSL_ENSURE(rRow.isValid() ,"Invalid size of vector!"); +#endif // the cache could repositioned so we need to adjust the cache // #104144# OJ if ( _bMoved && m_aCurrentRow.isNull() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
