mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba30c (1.29.4); FILE MERGED

Browse Source 
2008/04/23 10:51:44 fs 1.29.4.1: #153932# catch exceptions when creating the event attacher manager
This commit is contained in:
Rüdiger Timm
2008-06-06 12:34:55 +00:00
parent c42a6b8304
commit 77065b1666
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
forms/source/misc/InterfaceContainer.cxx
View File

@@ -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();
}
}
}