Tag: cws_src680_dba30 User: fs Date: 06/05/08 04:17:33 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx
Log: RESYNC: (1.142-1.143); FILE MERGED 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.133.12.8&r2=1.133.12.9 Delta lines: +9 -7 ------------------- --- RowSet.cxx 22 Mar 2006 19:36:41 -0000 1.133.12.8 +++ RowSet.cxx 8 May 2006 11:17:30 -0000 1.133.12.9 @@ -1474,7 +1474,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) @@ -2467,15 +2468,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(); } // ----------------------------------------------------------------------------- @@ -2758,7 +2760,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]
