diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-19 14:37:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-19 14:37:21 +0000 |
| commit | a925efdce202032d2e97bb8b00e46ca93130d788 (patch) | |
| tree | 139a059bf5c56fa7f50370b7727f2135e7de4434 /forms/source/component | |
| parent | b8f2774646dc2bc1673db7c06e2a7b1d908a595a (diff) | |
INTEGRATION: CWS dba202e (1.42.36); FILE MERGED
2006/01/09 10:06:42 fs 1.42.36.2: RESYNC: (1.42-1.44); FILE MERGED
2006/01/04 11:02:01 fs 1.42.36.1: #i59877# better (assertion) diagnostics when catching an exception
Diffstat (limited to 'forms/source/component')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 167fc454c971..c1c927657b43 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FormComponent.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: kz $ $Date: 2006-01-03 16:09:01 $ + * last change: $Author: obo $ $Date: 2006-01-19 15:37:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> @@ -1000,7 +1003,7 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlModel::read: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } xMark->jumpToMark(nMark); |