diff options
| author | Daniel Boelzle <dbo@openoffice.org> | 2001-05-11 09:15:01 +0000 |
|---|---|---|
| committer | Daniel Boelzle <dbo@openoffice.org> | 2001-05-11 09:15:01 +0000 |
| commit | 1ad25a072dce57586bde6941fa1a0125f9a78e23 (patch) | |
| tree | 26f12f0177f033c99559bc1dcee27c050172667c /cppuhelper | |
| parent | 61ea9bfa7b51d55b9fce474c16eacad4ba9d6e24 (diff) | |
init rdbtdp only if registry given
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/servicefactory.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index 976d4670bbe9..54d71e2d4c08 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: servicefactory.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dbo $ $Date: 2001-05-10 12:30:59 $ + * last change: $Author: dbo $ $Date: 2001-05-11 10:15:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,15 +213,6 @@ static Reference< lang::XMultiComponentFactory > bootstrapInitialSF( xSet->insert( aFac ); OSL_ENSURE( xSet->has( aFac ), "### failed registering registry td provider!" ); } - // registry td provider - { - Any aFac( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("rdbtdp") ), rBootstrapPath, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider") ), - xSF, Reference< registry::XRegistryKey >() ) ) ); - xSet->insert( aFac ); - OSL_ENSURE( xSet->has( aFac ), "### failed registering registry td provider!" ); - } // implementation registration { Any aFac( makeAny( loadSharedLibComponentFactory( @@ -267,6 +258,15 @@ static Reference< XComponentContext > initializeSF( if (xRegistry.is()) { + // add registry td provider + Reference< container::XSet > xSet( xSF, UNO_QUERY ); + Any aFac( makeAny( loadSharedLibComponentFactory( + OUString( RTL_CONSTASCII_USTRINGPARAM("rdbtdp") ), rBootstrapPath, + OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider") ), + Reference< lang::XMultiServiceFactory >( xSF, UNO_QUERY ), Reference< registry::XRegistryKey >() ) ) ); + xSet->insert( aFac ); + OSL_ENSURE( xSet->has( aFac ), "### failed registering registry td provider!" ); + // rdbtdp: registries to be used context_values[ 3 ].bLateInitService = false; context_values[ 3 ].name = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider.Registries") ); |