User: kz Date: 2008-05-05 15:57:22+0000 Modified: dba/dbaccess/source/ui/dlg/RelationDlg.cxx
Log: INTEGRATION: CWS dba30b (1.26.78); FILE MERGED 2008/04/15 22:13:23 fs 1.26.78.2: RESYNC: (1.26-1.27); FILE MERGED 2008/03/16 14:09:02 fs 1.26.78.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: RelationDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/RelationDlg.cxx?r1=1.27&r2=1.28 Delta lines: +12 -6 -------------------- --- RelationDlg.cxx 2008-04-10 14:34:53+0000 1.27 +++ RelationDlg.cxx 2008-05-05 15:57:20+0000 1.28 @@ -60,6 +60,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -78,6 +81,9 @@ #ifndef DBAUI_RELATIONCONTROL_HXX #include "RelationControl.hxx" #endif +#ifndef _CPPUHELPER_EXC_HLP_HXX_ +#include <cppuhelper/exc_hlp.hxx> +#endif #include <algorithm> @@ -247,15 +253,15 @@ return 0L; } } - catch(const SQLException& e) + catch( const SQLException& ) { - ::dbaui::showError( SQLExceptionInfo(e), + ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), this, static_cast<OJoinTableView*>(GetParent())->getDesignView()->getController()->getORB()); } - catch(const Exception&) + catch( const Exception& ) { - //OSL_ENSURE(sal_False, "ORelationDialog, OKClickHdl: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } m_bTriedOneUpdate = TRUE; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
