diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-16 11:34:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-16 11:39:03 +0100 |
| commit | 41e2b320209997767497f49f83f9520fb76261ec (patch) | |
| tree | 3b9acd2db074a35f11b5f119ebe8b04e2afe79b6 | |
| parent | Unfold remainder of add_access_control_entries at call site (diff) | |
| download | core-41e2b320209997767497f49f83f9520fb76261ec.tar.gz core-41e2b320209997767497f49f83f9520fb76261ec.zip | |
Register theTypeDescriptionManager normally in services.rdb
...no need to handle it specially during bootstrap.
Change-Id: I666dc9c0040a30a7d81ec1815c338be1407281bb
| -rw-r--r-- | cppuhelper/source/defaultbootstrap.cxx | 6 | ||||
| -rw-r--r-- | stoc/util/bootstrap.component | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index 6032acf95ed3..e0ff2d812280 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -88,12 +88,6 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri) false)); context_values.push_back( //TODO: from services.rdb? cppu::ContextEntry_Init( - "/singletons/com.sun.star.reflection.theTypeDescriptionManager", - css::uno::makeAny( - rtl::OUString("com.sun.star.comp.stoc.TypeDescriptionManager")), - true /*TODO: false?*/)); - context_values.push_back( //TODO: from services.rdb? - cppu::ContextEntry_Init( "/singletons/com.sun.star.util.theMacroExpander", css::uno::makeAny( cppuhelper::detail::create_bootstrap_macro_expander_factory()), diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component index 5ff3b07ae7ae..d6e9b0c4f03f 100644 --- a/stoc/util/bootstrap.component +++ b/stoc/util/bootstrap.component @@ -43,6 +43,7 @@ </implementation> <implementation name="com.sun.star.comp.stoc.TypeDescriptionManager"> <service name="com.sun.star.reflection.TypeDescriptionManager"/> + <singleton name="com.sun.star.reflection.theTypeDescriptionManager"/> </implementation> <implementation name="com.sun.star.security.comp.stoc.AccessController"> <service name="com.sun.star.security.AccessController"/> |