diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:57:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:57:20 +0000 |
| commit | ca95e9fccc4815a9cfb148fcc5eccfd78fbf2043 (patch) | |
| tree | 71d278305a1b0597748f55476def1ad7baa067e2 /dbaccess/source/ui/dlg/RelationDlg.cxx | |
| parent | INTEGRATION: CWS dba30b (1.2.144); FILE MERGED (diff) | |
| download | core-ca95e9fccc4815a9cfb148fcc5eccfd78fbf2043.tar.gz core-ca95e9fccc4815a9cfb148fcc5eccfd78fbf2043.zip | |
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
Diffstat (limited to 'dbaccess/source/ui/dlg/RelationDlg.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/RelationDlg.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index b2660a624bbf..af1c0d35e27e 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationDlg.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -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 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) 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; |