Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:42:47 Modified: /dba/dbaccess/source/core/api/ RowSetBase.cxx
Log: RESYNC: (1.84-1.85); FILE MERGED 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.6.3&r2=1.81.6.4 Delta lines: +16 -14 --------------------- --- RowSetBase.cxx 12 May 2006 16:25:12 -0000 1.81.6.3 +++ RowSetBase.cxx 23 May 2006 23:42:44 -0000 1.81.6.4 @@ -402,8 +402,10 @@ // ------------------------------------------------------------------------- Any SAL_CALL ORowSetBase::getObject( sal_Int32 /*columnIndex*/, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XRow::getObject", *m_pMySelf ); - return Any(); + ::osl::MutexGuard aGuard( *m_pMutex ); + checkCache(); + + return getValue(columnIndex).makeAny(); } // ------------------------------------------------------------------------- Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) @@ -478,7 +480,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveToBookmark(bookmark); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { // notification order @@ -520,7 +522,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->moveRelativeToBookmark(bookmark,rows); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { // notification order @@ -625,7 +627,7 @@ positionCache( MOVE_FORWARD ); sal_Bool bAfterLast = m_pCache->isAfterLast(); bRet = m_pCache->next(); - m_pCache->clearModified(); + doCancelModification( ); if ( bRet || bAfterLast != m_pCache->isAfterLast() ) @@ -749,7 +751,7 @@ { ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->beforeFirst(); - m_pCache->clearModified(); + doCancelModification( ); // notification order // - column values @@ -791,7 +793,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->afterLast(); - m_pCache->clearModified(); + doCancelModification( ); // notification order // - column values @@ -831,7 +833,7 @@ sal_Bool bMoved = ( bWasNew || !_aCheckFunctor(this) ); bRet = _aMovementFunctor(m_pCache); - m_pCache->clearModified(); + doCancelModification( ); if ( bRet ) { @@ -923,7 +925,7 @@ ORowSetRow aOldValues = getOldRow(bWasNew); bRet = m_pCache->absolute(row); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { @@ -975,7 +977,7 @@ positionCache( rows > 0 ? MOVE_FORWARD : MOVE_BACKWARD ); bRet = m_pCache->relative(rows); - m_pCache->clearModified(); + doCancelModification( ); if(bRet) { @@ -1022,7 +1024,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]
