User: kz Date: 2008-05-05 16:07:50+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.53&r2=1.54 Delta lines: +9 -6 ------------------- --- RelationController.cxx 2008-04-10 16:32:29+0000 1.53 +++ RelationController.cxx 2008-05-05 16:07:47+0000 1.54 @@ -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 @@ 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 @@ { showError(SQLExceptionInfo(e)); } - catch(Exception&) + catch(const Exception&) { - OSL_ENSURE(0,"Exception catched!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
