User: kz Date: 2008-05-05 16:08:36+0000 Modified: dba/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
Log: INTEGRATION: CWS dba30b (1.27.24); FILE MERGED 2008/04/15 22:14:33 fs 1.27.24.2: RESYNC: (1.27-1.28); FILE MERGED 2008/03/16 14:08:27 fs 1.27.24.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: FieldDescriptions.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx?r1=1.28&r2=1.29 Delta lines: +35 -32 --------------------- --- FieldDescriptions.cxx 2008-04-10 16:37:37+0000 1.28 +++ FieldDescriptions.cxx 2008-05-05 16:08:34+0000 1.29 @@ -36,6 +36,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _DBU_TBL_HRC_ #include "dbu_tbl.hrc" #endif @@ -185,9 +188,9 @@ if(xPropSetInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT)) SetAutoIncrement(::cppu::any2bool(xAffectedCol->getPropertyValue(PROPERTY_ISAUTOINCREMENT))); } - catch(Exception&) + catch(const Exception&) { - OSL_ENSURE(0,"Exception catched while getting the props"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -260,9 +263,9 @@ else m_sName = _rName; } - catch(Exception) + catch(const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -275,9 +278,9 @@ else m_sDescription = _rDescription; } - catch(Exception) + catch(const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -290,9 +293,9 @@ else m_aDefaultValue = _rDefaultValue; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -305,9 +308,9 @@ else m_aControlDefault = _rControlDefault; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -320,9 +323,9 @@ else m_sAutoIncrementValue = _sAutoIncValue; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -338,9 +341,9 @@ else m_nType = m_pType->nType; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -357,9 +360,9 @@ OSL_ENSURE(!m_pType.get(),"Invalid call here!"); } } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -372,9 +375,9 @@ else m_nPrecision = _rPrecision; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -387,9 +390,9 @@ else m_nScale = _rScale; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -402,9 +405,9 @@ else m_nIsNullable = _rIsNullable; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -417,9 +420,9 @@ else m_nFormatKey = _rFormatKey; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -432,9 +435,9 @@ else m_eHorJustify = _rHorJustify; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -447,9 +450,9 @@ else m_bIsAutoIncrement = _bAuto; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -594,9 +597,9 @@ else m_sTypeName = _sTypeName; } - catch(Exception) + catch( const Exception& ) { - OSL_ENSURE(0,"Exception catched while set a value!"); + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
