From bbb649a05c7fce7da1c396a5c1adc4380f48c7d0 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 27 Jun 2007 13:44:51 +0000
Subject: INTEGRATION: CWS sdblogging (1.10.26); FILE MERGED 2007/04/05
 07:47:04 fs 1.10.26.1: better diagnostics

---
 unotools/source/config/confignode.cxx | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 2dee7b982acd..72474c961990 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: confignode.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 01:23:34 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 14:44:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,6 +41,9 @@
 #ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
 #include <unotools/configpathes.hxx>
 #endif
+#ifndef TOOLS_DIAGNOSE_EX_H
+#include <tools/diagnose_ex.h>
+#endif
 #ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
 #endif
@@ -267,21 +270,9 @@ namespace utl
                 // if we're here, all was ok ...
                 return OConfigurationNode(_xNode, m_xProvider);
             }
-            catch (IllegalArgumentException&)
-            {
-                OSL_ENSURE(sal_False, "OConfigurationNode::createNode: caught an IllegalArgumentException!");
-            }
-            catch (ElementExistException&)
-            {
-                OSL_ENSURE(sal_False, "OConfigurationNode::createNode: caught an ElementExistException!");
-            }
-            catch (WrappedTargetException&)
-            {
-                OSL_ENSURE(sal_False, "OConfigurationNode::createNode: caught a WrappedTargetException!");
-            }
-            catch(Exception&)
+            catch(const Exception&)
             {
-                OSL_ENSURE(sal_False, "OConfigurationNode::createNode: caught a generic exception!");
+                DBG_UNHANDLED_EXCEPTION();
             }
 
             // dispose the child if it has already been created, but could not be inserted
@@ -305,9 +296,9 @@ namespace utl
             {
                 xNewChild = xChildFactory->createInstance();
             }
-            catch(Exception&)
+            catch(const Exception&)
             {
-                OSL_ENSURE(sal_False, "OConfigurationNode::createNode: caught a generic exception!");
+                DBG_UNHANDLED_EXCEPTION();
             }
             return insertNode(_rName,xNewChild);
         }
-- 
cgit