User: kz Date: 2008-05-05 15:56:19+0000 Modified: dba/dbaccess/source/ui/dlg/AdabasStat.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdabasStat.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdabasStat.cxx?r1=1.18&r2=1.19 Delta lines: +33 -26 --------------------- --- AdabasStat.cxx 2008-04-10 14:24:20+0000 1.18 +++ AdabasStat.cxx 2008-05-05 15:56:17+0000 1.19 @@ -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 @@ 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 @@ { ::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 @@ { ::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(); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
