diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:07:01 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:07:01 +0000 |
commit | b378c812936332179a382ea429eb4460983fc5d9 (patch) | |
tree | a6c288be0197759b3dce00d9fec0b47d2d3b5f42 /dbaccess/source/ui/querydesign/querydlg.cxx | |
parent | 87bab72acb0fb3bc2542432d879916677b17f0aa (diff) |
INTEGRATION: CWS dba30b (1.16.78); FILE MERGED
2008/04/15 22:14:25 fs 1.16.78.2: RESYNC: (1.16-1.17); FILE MERGED
2008/03/16 14:07:58 fs 1.16.78.1: some exception handling re-factoring
Diffstat (limited to 'dbaccess/source/ui/querydesign/querydlg.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 8afc3147ebaa..7a82798c88c9 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: querydlg.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -42,6 +42,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef DBAUI_QTABLECONNECTIONDATA_HXX #include "QTableConnectionData.hxx" #endif @@ -320,9 +323,9 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) m_pConnData->AppendConnLine(*pIter,*pIter); } } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught while asking for column names in case of a natural join."); + DBG_UNHANDLED_EXCEPTION(); } m_pTableControl->NotifyCellChange(); m_pTableControl->Invalidate(); |