User: hr Date: 06/04/19 06:18:32 Modified: /dba/dbaccess/source/core/api/ RowSetBase.cxx
Log: INTEGRATION: CWS oj17 (1.84.22); FILE MERGED 2006/03/09 12:31:40 oj 1.84.22.1: stl iterator usage fix 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.84&r2=1.85 Delta lines: +10 -10 --------------------- --- RowSetBase.cxx 6 Feb 2006 16:54:07 -0000 1.84 +++ RowSetBase.cxx 19 Apr 2006 13:18:30 -0000 1.85 @@ -406,7 +406,7 @@ ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); - return Any(); + return getValue(columnIndex).makeAny(); } // ------------------------------------------------------------------------- Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) @@ -489,7 +489,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveToBookmark(bookmark); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { // notification order @@ -531,7 +531,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveRelativeToBookmark(bookmark,rows); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { // notification order @@ -638,7 +638,7 @@ positionCache( MOVE_FORWARD ); sal_Bool bAfterLast = m_pCache->isAfterLast(); bRet = m_pCache->next(); - m_pCache->clearModified(); + doCancelModification( ); if ( bRet || bAfterLast != m_pCache->isAfterLast() ) @@ -762,7 +762,7 @@ { ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->beforeFirst(); - m_pCache->clearModified(); + doCancelModification( ); // notification order // - column values @@ -804,7 +804,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->afterLast(); - m_pCache->clearModified(); + doCancelModification( ); // notification order // - column values @@ -844,7 +844,7 @@ sal_Bool bMoved = ( bWasNew || !_aCheckFunctor(this) ); bRet = _aMovementFunctor(m_pCache); - m_pCache->clearModified(); + doCancelModification( ); if ( bRet ) { @@ -936,7 +936,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->absolute(row); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { @@ -988,7 +988,7 @@ positionCache( rows > 0 ? MOVE_FORWARD : MOVE_BACKWARD ); bRet = m_pCache->relative(rows); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { @@ -1035,7 +1035,7 @@ positionCache( MOVE_BACKWARD ); bRet = m_pCache->previous(); - m_pCache->clearModified(); + doCancelModification( ); // if m_bBeforeFirst is false and bRet is false than we stood on the first row if(!m_bBeforeFirst || bRet) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
