User: kz      
Date: 2008-05-05 16:01:29+0000
Modified:
   dba/dbaccess/source/ui/misc/documentcontroller.cxx

Log:
 INTEGRATION: CWS dba30b (1.5.164); FILE MERGED
 2008/04/15 22:14:06 fs 1.5.164.2: RESYNC: (1.5-1.6); FILE MERGED
 2008/03/16 14:06:33 fs 1.5.164.1: some exception handling re-factoring

File Changes:

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

File [changed]: documentcontroller.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/documentcontroller.cxx?r1=1.6&r2=1.7
Delta lines:  +3 -6
-------------------
--- documentcontroller.cxx      2008-04-10 16:06:29+0000        1.6
+++ documentcontroller.cxx      2008-05-05 16:01:26+0000        1.7
@@ -31,16 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef DBACCESS_SOURCE_UI_INC_DOCUMENTCONTROLLER_HXX
 #include "documentcontroller.hxx"
-#endif
 
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
 
-#ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
+#include <tools/diagnose_ex.h>
 
 //........................................................................
 namespace dbaui
@@ -125,7 +122,7 @@
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ModelControllerConnector::impl_connect: 
caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -140,7 +137,7 @@
         }
         catch( const Exception& )
         {
-               OSL_ENSURE( sal_False, 
"ModelControllerConnector::impl_disconnect: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 




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

Reply via email to