diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:40:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:40:32 +0000 |
| commit | fe47293a26b2eb3241d198d886bc87a8192a2568 (patch) | |
| tree | 440bebfb1604af155dbd0cac74dfe9c5e8f083b0 /dbaccess/source/core/api/resultcolumn.cxx | |
| parent | c14d0804ce18bf5bf0e2ea3c15773ee8ad17cbae (diff) | |
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)
Diffstat (limited to 'dbaccess/source/core/api/resultcolumn.cxx')
| -rw-r--r-- | dbaccess/source/core/api/resultcolumn.cxx | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 35ab26e2be9b..85b6bc3965f0 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -4,9 +4,9 @@ * * $RCSfile: resultcolumn.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2005-12-19 17:14:53 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:40:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 ::comphelper; 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 @@ void OResultColumn::impl_determineIsRowVersion_nothrow() } } } - 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(); } } // ----------------------------------------------------------------------------- |