Tag: cws_dev300_dba30b
User: fs      
Date: 2008-03-16 14:09:47+0000
Modified:
   dba/dbaccess/source/ui/control/RelationControl.cxx
   dba/dbaccess/source/ui/control/tabletree.cxx
   dba/dbaccess/source/ui/control/toolboxcontroller.cxx

Log:
 some exception handling re-factoring

File Changes:

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

File [changed]: RelationControl.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/RelationControl.cxx?r1=1.23&r2=1.23.4.1
Delta lines:  +10 -7
--------------------
--- RelationControl.cxx 2008-03-05 16:53:47+0000        1.23
+++ RelationControl.cxx 2008-03-16 14:09:44+0000        1.23.4.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: RelationControl.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.23.4.1 $
  *
- *  last change: $Author: kz $ $Date: 2008/03/05 16:53:47 $
+ *  last change: $Author: fs $ $Date: 2008/03/16 14:09:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,6 +51,9 @@
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
+#ifndef TOOLS_DIAGNOSE_EX_H
+#include <tools/diagnose_ex.h>
+#endif
 #ifndef DBAUI_TABLECONNECTIONDATA_HXX
 #include "TableConnectionData.hxx"
 #endif
@@ -430,9 +433,9 @@
                                m_pListCell->InsertEntry(String(), 0);
                        }
                }
-               catch(SQLException&)
+        catch( const Exception& )
                {
-                       OSL_ENSURE(0,"Exception caught while compose 
tablename!");
+            DBG_UNHANDLED_EXCEPTION();
                }
        }
        // 
-----------------------------------------------------------------------------

File [changed]: tabletree.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.cxx?r1=1.35&r2=1.35.64.1
Delta lines:  +15 -15
---------------------
--- tabletree.cxx       2007-11-21 15:51:49+0000        1.35
+++ tabletree.cxx       2008-03-16 14:09:44+0000        1.35.64.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tabletree.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.35.64.1 $
  *
- *  last change: $Author: ihi $ $Date: 2007/11/21 15:51:49 $
+ *  last change: $Author: fs $ $Date: 2008/03/16 14:09:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -501,7 +501,7 @@
        }
        catch( const Exception& )
        {
-               DBG_ERROR( "OTableTreeListBox::addedTable: caught an 
exception!" );
+        DBG_UNHANDLED_EXCEPTION();
        }
        return NULL;
 }
@@ -587,7 +587,7 @@
        }
        catch( const Exception& )
        {
-               DBG_ERROR( "OTableTreeListBox::removedTable: caught an 
exception!" );
+        DBG_UNHANDLED_EXCEPTION();
        }
        return NULL;
 }
@@ -602,7 +602,7 @@
        }
        catch( const Exception& )
        {
-               DBG_ERROR( "OTableTreeListBox::removedTable: caught an 
exception!" );
+        DBG_UNHANDLED_EXCEPTION();
        }
 }
 

File [changed]: toolboxcontroller.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/toolboxcontroller.cxx?r1=1.13&r2=1.13.84.1
Delta lines:  +8 -5
-------------------
--- toolboxcontroller.cxx       2007-10-23 14:38:32+0000        1.13
+++ toolboxcontroller.cxx       2008-03-16 14:09:44+0000        1.13.84.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: toolboxcontroller.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.13.84.1 $
  *
- *  last change: $Author: vg $ $Date: 2007/10/23 14:38:32 $
+ *  last change: $Author: fs $ $Date: 2008/03/16 14:09:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -80,6 +80,9 @@
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
 #include <svtools/moduleoptions.hxx>
 #endif
+#ifndef TOOLS_DIAGNOSE_EX_H
+#include <tools/diagnose_ex.h>
+#endif
 #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
 #include <svtools/menuoptions.hxx>
 #endif
@@ -268,9 +271,9 @@
                                        }
                                }
                        }
-                       catch(Exception&)
+                       catch(const Exception&)
                        {
-                               OSL_ENSURE(0,"Exception catched while filling 
popup menu!");
+                DBG_UNHANDLED_EXCEPTION();
                        }
                }
                else




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

Reply via email to