User: kz      
Date: 2008-05-05 16:07:04+0000
Modified:
   dba/dbaccess/source/ui/querydesign/querydlg.cxx

Log:
 INTEGRATION: CWS dba30b (1.16.78); FILE MERGED
 2008/04/15 22:14:25 fs 1.16.78.2: RESYNC: (1.16-1.17); FILE MERGED
 2008/03/16 14:07:58 fs 1.16.78.1: some exception handling re-factoring

File Changes:

Directory: /dba/dbaccess/source/ui/querydesign/
===============================================

File [changed]: querydlg.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querydlg.cxx?r1=1.17&r2=1.18
Delta lines:  +5 -2
-------------------
--- querydlg.cxx        2008-04-10 16:28:57+0000        1.17
+++ querydlg.cxx        2008-05-05 16:07:01+0000        1.18
@@ -42,6 +42,9 @@
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
+#ifndef TOOLS_DIAGNOSE_EX_H
+#include <tools/diagnose_ex.h>
+#endif
 #ifndef DBAUI_QTABLECONNECTIONDATA_HXX
 #include "QTableConnectionData.hxx"
 #endif
@@ -320,9 +323,9 @@
                     m_pConnData->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();
         }
         m_pTableControl->NotifyCellChange();
         m_pTableControl->Invalidate();




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to