diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:56:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:56:32 +0000 |
| commit | 64793735a1213a4ad3114a51c585e470f98c1b4f (patch) | |
| tree | 3995590fa31904fbfd222a06c277e16c0f099302 /dbaccess/source/ui/dlg/CollectionView.cxx | |
| parent | a084b4be67473591148d90a2594bada73fee20db (diff) | |
INTEGRATION: CWS dba30b (1.9.158); FILE MERGED
2008/04/15 22:13:13 fs 1.9.158.2: RESYNC: (1.9-1.10); FILE MERGED
2008/03/16 14:09:02 fs 1.9.158.1: some exception handling re-factoring
Diffstat (limited to 'dbaccess/source/ui/dlg/CollectionView.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/CollectionView.cxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 942b3bc0b235..7c1d053825ad 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CollectionView.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -39,6 +39,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" #endif @@ -274,9 +277,9 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) EndDialog( TRUE ); } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } return 0; } @@ -293,9 +296,9 @@ IMPL_LINK( OCollectionView, NewFolder_Click, PushButton*, EMPTYARG ) { showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), this, m_xORB ); } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } return 0; } @@ -318,9 +321,9 @@ IMPL_LINK( OCollectionView, Up_Click, PushButton*, EMPTYARG ) m_aUp.Disable(); } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } return 0; } @@ -349,9 +352,9 @@ IMPL_LINK( OCollectionView, Dbl_Click_FileView, SvtFileView*, EMPTYARG ) } } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } return 0; } @@ -371,9 +374,9 @@ void OCollectionView::initCurrentPath() bEnable = xChild.is() && Reference<XNameAccess>(xChild->getParent(),UNO_QUERY).is(); } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception caught!"); + DBG_UNHANDLED_EXCEPTION(); } m_aUp.Enable(bEnable); } |