diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-15 18:05:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-16 11:39:03 +0100 |
| commit | fc9d23ff550194ba50fc6506ec901c22681d1b1c (patch) | |
| tree | efe3cbec9f9a3c97c13386768eba586e14efcc99 /cppuhelper/source/defaultbootstrap.cxx | |
| parent | 556f94881225cdf1ae34dc9955bd5c04ffee9f14 (diff) | |
Reorganize defaultbootstrap so that typedescriptionprovider can use servicemgr
...instead of having to rely on the odd bootstrapInitialSF and explicit
loadSharedLibComponentFactory.
Change-Id: I2fb212024c483254da015db3af43d9002051dddc
Diffstat (limited to 'cppuhelper/source/defaultbootstrap.cxx')
| -rw-r--r-- | cppuhelper/source/defaultbootstrap.cxx | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index e4b3cd537117..d4863b323c73 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -34,7 +34,6 @@ #include "com/sun/star/container/XHierarchicalNameAccess.hpp" #include "com/sun/star/container/XSet.hpp" -#include "com/sun/star/registry/XSimpleRegistry.hpp" #include "com/sun/star/uno/DeploymentException.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" @@ -127,22 +126,13 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri) context->getValueByName( "/singletons/com.sun.star.reflection.theTypeDescriptionManager"), css::uno::UNO_QUERY_THROW); - css::uno::Reference< css::registry::XSimpleRegistry > typereg( - cppuhelper::createTypeRegistry( - getBootstrapVariable(bs, "UNO_TYPES"), - getBootstrapVariable(bs, "URE_INTERNAL_LIB_DIR"))); - if (typereg.is()) { - css::uno::Sequence< css::uno::Any > arg(1); - arg[0] <<= typereg; - css::uno::Reference< css::container::XSet >( - tdmgr, css::uno::UNO_QUERY_THROW)-> - insert( - css::uno::makeAny( - smgr->createInstanceWithArgumentsAndContext( - ("com.sun.star.comp.stoc" - ".RegistryTypeDescriptionProvider"), - arg, context))); - } + css::uno::Reference< css::container::XSet >( + tdmgr, css::uno::UNO_QUERY_THROW)-> + insert( + css::uno::makeAny( + cppuhelper::createTypeDescriptionProvider( + getBootstrapVariable(bs, "UNO_TYPES"), smgr.get(), + context))); cppu::installTypeDescriptionManager(tdmgr); return context; } |