User: hr Date: 06/01/25 05:43:07 Modified: /dba/dbaccess/source/core/api/ RowSetBase.cxx
Log: INTEGRATION: CWS stlusagefix01 (1.80.10); FILE MERGED 2006/01/17 09:00:13 oj 1.80.10.2: #i60480# stl usage corrected 2006/01/16 13:47:16 oj 1.80.10.1: #i60480# fix stl usage 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.81&r2=1.82 Delta lines: +12 -4 -------------------- --- RowSetBase.cxx 16 Jan 2006 15:27:28 -0000 1.81 +++ RowSetBase.cxx 25 Jan 2006 13:43:05 -0000 1.82 @@ -460,6 +460,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveToBookmark(bookmark); + m_pCache->clearModified(); if(bRet) { // notification order @@ -502,6 +503,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveRelativeToBookmark(bookmark,rows); + m_pCache->clearModified(); if(bRet) { // notification order @@ -609,6 +611,7 @@ positionCache(); sal_Bool bAfterLast = m_pCache->isAfterLast(); bRet = m_pCache->next(); + m_pCache->clearModified(); if ( bRet || bAfterLast != m_pCache->isAfterLast() ) @@ -725,6 +728,7 @@ { ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->beforeFirst(); + m_pCache->clearModified(); // notification order // - column values @@ -766,6 +770,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->afterLast(); + m_pCache->clearModified(); // notification order // - column values @@ -805,6 +810,7 @@ sal_Bool bMoved = ( bWasNew || !_aCheckFunctor(this) ); bRet = _aMovementFunctor(m_pCache); + m_pCache->clearModified(); if ( bRet ) { @@ -899,6 +905,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->absolute(row); + m_pCache->clearModified(); if(bRet) { @@ -951,6 +958,7 @@ if ( m_aBookmark.hasValue() ) // #104474# OJ positionCache(); bRet = m_pCache->relative(rows); + m_pCache->clearModified(); if(bRet) { @@ -998,6 +1006,7 @@ if ( m_aBookmark.hasValue() ) // #104474# OJ positionCache(); bRet = m_pCache->previous(); + m_pCache->clearModified(); // if m_bBeforeFirst is false and bRet is false than we stood on the first row if(!m_bBeforeFirst || bRet) @@ -1025,6 +1034,7 @@ DBG_TRACE1("DBACCESS ORowSetBase::setCurrentRow() Clone = %i",m_bClone); m_bBeforeFirst = m_pCache->isBeforeFirst(); m_bAfterLast = m_pCache->isAfterLast(); + //m_pCache->resetInsertRow(sal_True); if(!(m_bBeforeFirst || m_bAfterLast)) { @@ -1158,8 +1168,6 @@ sal_Bool bNull = m_aCurrentRow.isNull(); ORowSetMatrix::iterator atest = m_aCurrentRow; #endif - // OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!"); - OSL_ENSURE(m_aCurrentRow->isValid(),"Currentrow isn't valid"); sal_Int32 i=0; try { @@ -1250,7 +1258,7 @@ OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." ); // remember the "inserted" and "modified" state for later firing - m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() );; + m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ); m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ); // if the row set is on the insert row, then we need to cancel this --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
