User: kz Date: 2008-05-05 16:01:57+0000 Modified: dba/dbaccess/source/ui/misc/indexcollection.cxx
Log: INTEGRATION: CWS dba30b (1.8.240); FILE MERGED 2008/04/15 22:14:09 fs 1.8.240.2: RESYNC: (1.8-1.9); FILE MERGED 2008/03/16 14:06:33 fs 1.8.240.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: indexcollection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/indexcollection.cxx?r1=1.9&r2=1.10 Delta lines: +14 -15 --------------------- --- indexcollection.cxx 2008-04-10 16:07:50+0000 1.9 +++ indexcollection.cxx 2008-05-05 16:01:54+0000 1.10 @@ -34,8 +34,8 @@ #ifndef _DBAUI_INDEXCOLLECTION_HXX_ #include "indexcollection.hxx" #endif -#ifndef _OSL_DIAGNOSE_H_ -#include <osl/diagnose.h> +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> #endif #ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_ #include <com/sun/star/sdbcx/XAppend.hpp> @@ -232,10 +232,9 @@ { // allowed to pass throw; } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OIndexCollection::commitNewIndex: caught a strange exception ...."); - return; + DBG_UNHANDLED_EXCEPTION(); } } @@ -259,9 +258,9 @@ { // allowed to pass throw; } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OIndexCollection::drop: caught a strange exception ...."); + DBG_UNHANDLED_EXCEPTION(); return sal_False; } @@ -370,9 +369,9 @@ { // allowed to pass throw; } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "OIndexCollection::resetIndex: caught an unknown exception!"); + DBG_UNHANDLED_EXCEPTION(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
