User: hr Date: 06/06/19 19:40:35 Modified: /dba/dbaccess/source/core/api/ resultcolumn.cxx
Log: INTEGRATION: CWS warnings01 (1.7.28); FILE MERGED 2006/03/24 15:35:49 fs 1.7.28.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: resultcolumn.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultcolumn.cxx?r1=1.7&r2=1.8 Delta lines: +7 -14 -------------------- --- resultcolumn.cxx 19 Dec 2005 17:14:53 -0000 1.7 +++ resultcolumn.cxx 20 Jun 2006 02:40:32 -0000 1.8 @@ -53,6 +53,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef DBACCESS_SHARED_DBASTRINGS_HRC #include "dbastrings.hrc" #endif @@ -79,15 +82,15 @@ using namespace ::cppu; using namespace dbaccess; -DBG_NAME(OResultColumn); +DBG_NAME(OResultColumn) //-------------------------------------------------------------------------- OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta ) :m_xMetaData(_xMetaData) - ,m_nPos(_nPos) ,m_xDBMetaData(_rxDBMeta) + ,m_nPos(_nPos) { DBG_CTOR(OResultColumn,NULL); } @@ -125,19 +128,9 @@ } } } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - Any caught( ::cppu::getCaughtException() ); - ::rtl::OString sMessage( "impl_determineIsRowVersion_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(); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
