User: hr Date: 06/04/19 06:18:21 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx
Log: INTEGRATION: CWS oj17 (1.142.22); FILE MERGED 2006/03/09 12:31:39 oj 1.142.22.1: stl iterator usage fix File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.142&r2=1.143 Delta lines: +6 -4 ------------------- --- RowSet.cxx 6 Feb 2006 16:53:55 -0000 1.142 +++ RowSet.cxx 19 Apr 2006 13:18:18 -0000 1.143 @@ -1473,7 +1473,8 @@ // ------------------------------------------------------------------------- Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) throw(SQLException, RuntimeException) { - return Any(); + ::osl::MutexGuard aGuard( *m_pMutex ); + return getInsertValue(columnIndex).makeAny(); } // ------------------------------------------------------------------------- Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) @@ -2458,15 +2459,16 @@ // ----------------------------------------------------------------------------- void ORowSet::doCancelModification( ) { - OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" ); + //OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" ); if ( isModification() ) m_pCache->cancelRowModification(); + m_bModified = sal_False; } // ----------------------------------------------------------------------------- sal_Bool ORowSet::isModification( ) { - return m_pCache && m_pCache->m_bNew; + return isNew(); } // ----------------------------------------------------------------------------- @@ -2749,7 +2751,7 @@ // ----------------------------------------------------------------------------- void ORowSetClone::doCancelModification( ) { - OSL_ENSURE( sal_False, "ORowSetClone::doCancelModification: invalid call!" ); + //OSL_ENSURE( sal_False, "ORowSetClone::doCancelModification: invalid call!" ); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
