diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:34:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:34:55 +0000 |
| commit | 77065b16665d951af6c14917a61679c228b99129 (patch) | |
| tree | 4b948f47feb34a8fb3ac352174595bb0448589fd /forms | |
| parent | c42a6b8304a8d0acf74859c842ba2e265e593054 (diff) | |
INTEGRATION: CWS dba30c (1.29.4); FILE MERGED
2008/04/23 10:51:44 fs 1.29.4.1: #153932# catch exceptions when creating the event attacher manager
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 30200b134a4b..55fec77ffb11 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: InterfaceContainer.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -107,8 +107,15 @@ OInterfaceContainer::OInterfaceContainer( ,m_aElementType(_rElementType) ,m_xServiceFactory(_rxFactory) { - m_xEventAttacher = ::comphelper::createEventAttacherManager(m_xServiceFactory); - OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::OInterfaceContainer: no event attacher manager! (corrupt installation?)" ); + try + { + m_xEventAttacher = ::comphelper::createEventAttacherManager(m_xServiceFactory); + OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::OInterfaceContainer: no event attacher manager!" ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } } OInterfaceContainer::~OInterfaceContainer() {} @@ -478,8 +485,15 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& } else { - m_xEventAttacher = ::comphelper::createEventAttacherManager( m_xServiceFactory ); - OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::read: could not create an event attacher manager!" ); + try + { + m_xEventAttacher = ::comphelper::createEventAttacherManager( m_xServiceFactory ); + OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::read: could not create an event attacher manager!" ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } } } |