diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:59:27 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:59:27 +0000 |
| commit | abe1e9a08ab4eee0b66e0ca37fe52a683199a89d (patch) | |
| tree | cdcd1d6e0ec835e35f88773c282a0660ec1bc8c2 /extensions/source/propctrlr/handlerhelper.cxx | |
| parent | ff227c495cb94a79bdeda00de8da07d789e19ec4 (diff) | |
INTEGRATION: CWS wae4extensions (1.7.44); FILE MERGED
2007/09/27 07:18:25 fs 1.7.44.1: #i81612# warning-free code
Diffstat (limited to 'extensions/source/propctrlr/handlerhelper.cxx')
| -rw-r--r-- | extensions/source/propctrlr/handlerhelper.cxx | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 8d94df14f9c1..6853d22af488 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: handlerhelper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2007-07-06 08:49:40 $ + * last change: $Author: ihi $ $Date: 2008-01-14 14:59:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,6 +91,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> #endif @@ -321,16 +324,9 @@ namespace pcr Reference< XModifiable > xDocumentModifiable( _rContext.getContextValueByAsciiName( "ContextDocument" ), UNO_QUERY_THROW ); xDocumentModifiable->setModified( sal_True ); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "PropertyHandlerHelper::setContextDocumentModified: 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(); } } @@ -343,16 +339,9 @@ namespace pcr Reference< XWindow > xInspectorWindow( _rContext.getContextValueByAsciiName( "DialogParentWindow" ), UNO_QUERY_THROW ); pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow ); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "PropertyHandlerHelper::getDialogParentWindow: 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 pInspectorWindow; } |