diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:46:51 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:46:51 +0000 |
| commit | 75cfbcda2f2f6b5a4f898a3268ec3ab72882e14e (patch) | |
| tree | 9877ff07b398d05fea11a4b796efa14610d448c2 /extensions/source/propctrlr/commoncontrol.cxx | |
| parent | b42e1f6fc97ec8f754104b6c16fc1257f53cf3fe (diff) | |
INTEGRATION: CWS dba23a (1.8.44); FILE MERGED
2007/03/21 13:20:16 fs 1.8.44.2: #i73260#
2007/02/22 11:27:16 fs 1.8.44.1: #i73260# misc warning issues
Diffstat (limited to 'extensions/source/propctrlr/commoncontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index fa8b5cf38..33398b573 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: commoncontrol.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2006-12-13 11:57:02 $ + * last change: $Author: kz $ $Date: 2007-05-10 10:46:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,6 +46,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _SV_COMBOBOX_HXX #include <vcl/combobox.hxx> #endif @@ -126,16 +129,9 @@ namespace pcr m_xContext->valueChanged( &m_rAntiImpl ); m_bModified = sal_False; } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "ControlHelper::notifyModifiedValue: caught an exception!\n" ); - sMessage += "message:\n"; - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage ); - #else - e; // make compiler happy - #endif + DBG_UNHANDLED_EXCEPTION(); } } } @@ -169,16 +165,9 @@ namespace pcr if ( m_xContext.is() ) m_xContext->activateNextControl( const_cast< XPropertyControl* >( &m_rAntiImpl ) ); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "ControlHelper::impl_activateNextControl_nothrow: caught an exception!\n" ); - sMessage += "message:\n"; - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage ); - #else - e; // make compiler happy - #endif + DBG_UNHANDLED_EXCEPTION(); } } @@ -216,16 +205,9 @@ namespace pcr if ( m_xContext.is() ) m_xContext->focusGained( &m_rAntiImpl ); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "ControlHelper, GetFocusHdl: caught an exception!\n" ); - sMessage += "message:\n"; - 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 0; } |