Revert "WIP: Experimental new binary type.rdb format"

This reverts commit 892ef8b0565c7f5f343d71e3b61c41655f80267b,
Windows-only cli_ure needs to be adapted first.

1 files changed, 15 insertions, 12 deletions

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 54516ea59174..39d5b22326e7 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -32,6 +32,8 @@
 #include <cassert>
 #include <vector>
 
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XSet.hpp"
 #include "com/sun/star/uno/DeploymentException.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Reference.hxx"
@@ -45,7 +47,7 @@
 #include "macro_expander.hxx"
 #include "paths.hxx"
 #include "servicemanager.hxx"
-#include "typemanager.hxx"
+#include "typedescriptionprovider.hxx"
 
 namespace {
 
@@ -76,9 +78,6 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
     rtl::Reference< cppuhelper::ServiceManager > smgr(
         new cppuhelper::ServiceManager(
             getBootstrapVariable(bs, "UNO_SERVICES")));
-    rtl::Reference< cppuhelper::TypeManager > tmgr(
-        new cppuhelper::TypeManager(
-            getBootstrapVariable(bs, "UNO_TYPES")));
     cppu::ContextEntry_Init entry;
     std::vector< cppu::ContextEntry_Init > context_values;
     context_values.push_back(
@@ -88,13 +87,6 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
                 css::uno::Reference< css::uno::XInterface >(
                     static_cast< cppu::OWeakObject * >(smgr.get()))),
             false));
-    context_values.push_back(
-        cppu::ContextEntry_Init(
-            "/singletons/com.sun.star.reflection.theTypeDescriptionManager",
-            css::uno::makeAny(
-                css::uno::Reference< css::uno::XInterface >(
-                    static_cast< cppu::OWeakObject * >(tmgr.get()))),
-            false));
     context_values.push_back( //TODO: from services.rdb?
         cppu::ContextEntry_Init(
             "/singletons/com.sun.star.util.theMacroExpander",
@@ -118,7 +110,18 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
             &context_values[0], context_values.size(),
             css::uno::Reference< css::uno::XComponentContext >()));
     smgr->setContext(context);
-    cppu::installTypeDescriptionManager(tmgr.get());
+    css::uno::Reference< css::container::XHierarchicalNameAccess > tdmgr(
+        context->getValueByName(
+            "/singletons/com.sun.star.reflection.theTypeDescriptionManager"),
+        css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::container::XSet >(
+        tdmgr, css::uno::UNO_QUERY_THROW)->
+        insert(
+            css::uno::makeAny(
+                cppuhelper::createTypeDescriptionProviders(
+                    getBootstrapVariable(bs, "UNO_TYPES"), smgr.get(),
+                    context)));
+    cppu::installTypeDescriptionManager(tdmgr);
     return context;
 }