diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:07:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:07:47 +0000 |
| commit | e327b38f888cdd67b52c5fbfff3beee63e6c9488 (patch) | |
| tree | fc9b139ba444e91359b9206b15fefaf4e3e5a1f7 /dbaccess | |
| parent | b378c812936332179a382ea429eb4460983fc5d9 (diff) | |
INTEGRATION: CWS dba30b (1.51.4); FILE MERGED
2008/04/15 22:14:29 fs 1.51.4.2: RESYNC: (1.51-1.53); FILE MERGED
2008/03/16 14:07:51 fs 1.51.4.1: some exception handling re-factoring
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationController.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index b5abf6564f9f..58f4659b3fe5 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationController.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.54 $ * * This file is part of OpenOffice.org. * @@ -151,6 +151,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _SV_WAITOBJ_HXX #include <vcl/waitobj.hxx> #endif @@ -328,9 +331,9 @@ void ORelationController::impl_initialize() if(m_vTableData.empty()) Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>()); } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "ORelationController::initialize: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -404,9 +407,9 @@ void ORelationController::loadData() { showError(SQLExceptionInfo(e)); } - catch(Exception&) + catch(const Exception&) { - OSL_ENSURE(0,"Exception catched!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- |