User: hr Date: 06/06/19 19:41:07 Modified: /dba/dbaccess/source/core/api/ resultset.cxx
Log: INTEGRATION: CWS warnings01 (1.14.28); FILE MERGED 2006/05/23 23:43:39 sb 1.14.28.2: RESYNC: (1.14-1.15); FILE MERGED 2006/03/24 15:35:49 fs 1.14.28.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: resultset.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultset.cxx?r1=1.15&r2=1.16 Delta lines: +17 -22 --------------------- --- resultset.cxx 4 May 2006 08:36:37 -0000 1.15 +++ resultset.cxx 20 Jun 2006 02:41:05 -0000 1.16 @@ -62,6 +62,9 @@ #ifndef _TOOLS_DEBUG_HXX //autogen #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _DBA_COREAPI_DATACOLUMN_HXX_ #include <datacolumn.hxx> #endif @@ -90,7 +93,7 @@ using namespace dbaccess; using namespace dbtools; -DBG_NAME(OResultSet); +DBG_NAME(OResultSet) //-------------------------------------------------------------------------- OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet, @@ -279,6 +282,15 @@ //------------------------------------------------------------------------------ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException ) { + // be lazy ... + rConvertedValue = rValue; + getFastPropertyValue( rOldValue, nHandle ); + return sal_True; +} + +//------------------------------------------------------------------------------ +void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) +{ // set it for the driver result set Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); switch (nHandle) @@ -292,13 +304,6 @@ default: DBG_ERROR("unknown Property"); } - return sal_False; -} - -//------------------------------------------------------------------------------ -void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) -{ - // done in convert... } //------------------------------------------------------------------------------ @@ -381,19 +386,9 @@ if ( xConn.is() ) xDBMetaData = xConn->getMetaData(); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - Any caught( ::cppu::getCaughtException() ); - ::rtl::OString sMessage( "lcl_getDBMetaDataFromStatement_nothrow: caught an exception!" ); - sMessage += "\ntype: "; - sMessage += ::rtl::OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); - sMessage += "\nmessage: "; - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage ); - #else - e; // make compiler happy - #endif + DBG_UNHANDLED_EXCEPTION(); } return xDBMetaData; } @@ -965,14 +960,14 @@ } //------------------------------------------------------------------------------ -sal_Int32 OResultSet::compareBookmarks(const Any& first, const Any& second) throw( SQLException, RuntimeException ) +sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); checkBookmarkable(); - return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(first, second); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second); } //------------------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
