From db01cbeabc777dba879fffb5f4037ba9b20bc6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 9 Feb 2006 13:10:13 +0000 Subject: [PATCH] INTEGRATION: CWS fwk32 (1.7.46); FILE MERGED 2006/01/30 10:39:16 mav 1.7.46.1: #129051# allow to register close- and terminate-listener without exception support --- comphelper/source/misc/facreg.cxx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/comphelper/source/misc/facreg.cxx b/comphelper/source/misc/facreg.cxx index 9c0cad2eb259..d93a1900dd89 100644 --- a/comphelper/source/misc/facreg.cxx +++ b/comphelper/source/misc/facreg.cxx @@ -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 #include +#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()) {