Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:42:32 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.139.26.3&r2=1.139.26.4 Delta lines: +9 -7 ------------------- --- RowSet.cxx 12 May 2006 16:25:12 -0000 1.139.26.3 +++ RowSet.cxx 23 May 2006 23:42:29 -0000 1.139.26.4 @@ -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) @@ -2457,15 +2458,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(); } // ----------------------------------------------------------------------------- @@ -2748,7 +2750,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]
