User: kz Date: 2008-05-05 16:05:22+0000 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: INTEGRATION: CWS dba30b (1.90.24); FILE MERGED 2008/04/15 22:14:18 fs 1.90.24.2: RESYNC: (1.90-1.91); FILE MERGED 2008/03/16 14:07:58 fs 1.90.24.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.91&r2=1.92 Delta lines: +7 -4 ------------------- --- QueryDesignView.cxx 2008-04-10 16:20:30+0000 1.91 +++ QueryDesignView.cxx 2008-05-05 16:05:19+0000 1.92 @@ -51,6 +51,9 @@ #ifndef _UNDO_HXX #include <svtools/undo.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef DBAUI_QYDLGTAB_HXX #include "adtabdlg.hxx" #endif @@ -266,9 +269,9 @@ aInfoData->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(); } } @@ -569,9 +572,9 @@ } aDBName = aTableListStr; } - catch(SQLException&) + catch(const SQLException&) { - OSL_ENSURE(0,"Exception catched while building table table for query!"); + DBG_UNHANDLED_EXCEPTION(); } } return aDBName; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
