strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwk32 (1.7.46); FILE MERGED

Browse source 
2006/01/30 10:39:16 mav 1.7.46.1: #129051# allow to register close- and terminate-listener without exception support
This commit is contained in:
Rüdiger Timm 2006-02-09 13:10:13 +00:00
parent b50871372a
commit db01cbeabc
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
comphelper/source/misc/facreg.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: facreg.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: rt $ $Date: 2005-09-08 02:49:53 $
* last change: $Author: rt $ $Date: 2006-02-09 14:10:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -52,6 +52,8 @@
#include <cppuhelper/factory.hxx>
#include <uno/lbnames.h>
#include "instancelocker.hxx"
using namespace rtl;
using namespace com::sun::star;
@ -128,6 +130,9 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManag
// OfficeInstallationDirectories
writeInfo( pKey, OfficeInstallationDirectories_getImplementationName(), OfficeInstallationDirectories_getSupportedServiceNames() );
registerSingleton( pKey, OfficeInstallationDirectories_getImplementationName(), OfficeInstallationDirectories_getSingletonName(), OfficeInstallationDirectories_getSingletonServiceName() );
// InstanceLocker
writeInfo( pKey, OInstanceLocker::impl_staticGetImplementationName(), OInstanceLocker::impl_staticGetSupportedServiceNames() );
}
catch (registry::InvalidRegistryException &)
{
@ -175,6 +180,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp
OfficeInstallationDirectories_createInstance,
OfficeInstallationDirectories_getSupportedServiceNames() );
}
else if( OInstanceLocker::impl_staticGetImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )
{
xFactory = ::cppu::createSingleFactory( xMSF,
OInstanceLocker::impl_staticGetImplementationName(),
OInstanceLocker::impl_staticCreateSelfInstance,
OInstanceLocker::impl_staticGetSupportedServiceNames() );
}
if( xFactory.is())
{