diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:56:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:56:17 +0000 |
| commit | a084b4be67473591148d90a2594bada73fee20db (patch) | |
| tree | a23ba0065e361325c966fe1a2d51746c2f063baf /dbaccess | |
| parent | e5a1b9ec7a9c6474f054ca849593a407a4157af0 (diff) | |
INTEGRATION: CWS dba30b (1.17.144); FILE MERGED
2008/04/15 22:13:10 fs 1.17.144.2: RESYNC: (1.17-1.18); FILE MERGED
2008/03/16 14:09:02 fs 1.17.144.1: some exception handling re-factoring
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/AdabasStat.cxx | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index 002f10d8dbab..b04ece8a24cf 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasStat.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -30,9 +30,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" + #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef _CPPUHELPER_EXC_HLP_HXX_ +#include <cppuhelper/exc_hlp.hxx> +#endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _DBAUI_ADASTAT_HXX_ #include "AdabasStat.hxx" #endif @@ -156,21 +163,21 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, else showError(); } - catch(const SQLException& e) + catch(const SQLException& ) { - ::dbaui::showError(SQLExceptionInfo(e),pParent,_xFactory); + ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), pParent, _xFactory ); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } try { ::comphelper::disposeComponent(xStmt); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } // now fill the datadev spaces @@ -204,17 +211,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, { ::dbaui::showError(SQLExceptionInfo(e),pParent,_xFactory); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } try { ::comphelper::disposeComponent(xStmt); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } // now fill the sysdatadev spaces @@ -258,17 +265,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, { ::dbaui::showError(SQLExceptionInfo(e),pParent,_xFactory); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } try { ::comphelper::disposeComponent(xStmt); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OAdabasStatistics::OAdabasStatistics: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } } |