User: kz Date: 2008-03-06 18:21:49+0000 Modified: dba/dbaccess/source/ui/dlg/tablespage.cxx
Log: INTEGRATION: CWS odbmacros2 (1.30.98); FILE MERGED 2008/02/20 13:28:01 fs 1.30.98.1.2.1: some DBG_UNHANDLED_EXCEPTIONs 2007/12/06 13:34:15 fs 1.30.98.1: during #i49133#: support a HelpURL property File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: tablespage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.cxx?r1=1.31&r2=1.32 Delta lines: +8 -4 ------------------- --- tablespage.cxx 2008-03-05 17:00:51+0000 1.31 +++ tablespage.cxx 2008-03-06 18:21:46+0000 1.32 @@ -123,6 +123,9 @@ #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> #endif +#ifndef _CPPUHELPER_EXC_HLP_HXX_ +#include <cppuhelper/exc_hlp.hxx> +#endif //......................................................................... namespace dbaui @@ -406,14 +409,15 @@ m_pTablesDlg->successfullyConnected(); } } - catch (SQLContext& e) { aErrorInfo = SQLExceptionInfo(e); } - catch (SQLWarning& e) { aErrorInfo = SQLExceptionInfo(e); } - catch (SQLException& e) { aErrorInfo = SQLExceptionInfo(e); } + catch (const SQLException&) + { + aErrorInfo = ::cppu::getCaughtException(); + } if (aErrorInfo.isValid()) { // establishing the connection failed. Show an error window and exit. - OSQLMessageBox aMessageBox(GetParent()->GetParent(), aErrorInfo, WB_OK | WB_DEF_OK, OSQLMessageBox::Error); + OSQLMessageBox aMessageBox( GetParent()->GetParent(), aErrorInfo ); aMessageBox.Execute(); m_aTables.Enable(sal_False); m_aTablesList.Enable(sal_False); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
