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

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

5 files changed, 603 insertions, 1009 deletions

diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index b594b533aea1..577efbcf942d 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,cppuhelper,\
 	cppuhelper/source/shlib \
 	cppuhelper/source/supportsservice \
 	cppuhelper/source/tdmgr \
-	cppuhelper/source/typemanager \
+	cppuhelper/source/typedescriptionprovider \
 	cppuhelper/source/typeprovider \
 	cppuhelper/source/unourl \
 	cppuhelper/source/weak \
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;
 }
 
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typedescriptionprovider.cxx
index 721d5975b985..7dbe5e590b88 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -10,17 +10,16 @@
 #include "sal/config.h"
 
 #include <cassert>
-#include <cstddef>
 #include <cstdlib>
-#include <cstring>
 #include <set>
 #include <stack>
 #include <vector>
 
 #include "boost/noncopyable.hpp"
-#include "com/sun/star/container/ElementExistException.hpp"
 #include "com/sun/star/container/NoSuchElementException.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/reflection/InvalidTypeNameException.hpp"
 #include "com/sun/star/reflection/NoSuchTypeNameException.hpp"
 #include "com/sun/star/reflection/TypeDescriptionSearchDepth.hpp"
@@ -36,96 +35,58 @@
 #include "com/sun/star/reflection/XServiceTypeDescription2.hpp"
 #include "com/sun/star/reflection/XSingletonTypeDescription2.hpp"
 #include "com/sun/star/reflection/XStructTypeDescription.hpp"
-#include "com/sun/star/reflection/XTypeDescription.hpp"
+#include "com/sun/star/reflection/XTypeDescriptionEnumeration.hpp"
+#include "com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp"
+#include "com/sun/star/registry/InvalidRegistryException.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/DeploymentException.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/TypeClass.hpp"
-#include "cppu/unotype.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/compbase2.hxx"
 #include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/supportsservice.hxx"
 #include "osl/file.hxx"
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
-#include "rtl/string.h"
 #include "rtl/ustring.hxx"
-#include "sal/macros.h"
 #include "sal/types.h"
 #include "unoidl/unoidl.hxx"
+#include "unoidl/unoidlprovider.hxx"
 
 #include "paths.hxx"
-#include "typemanager.hxx"
+#include "typedescriptionprovider.hxx"
 
 namespace {
 
-css::uno::Any resolveTypedefs(css::uno::Any const & type) {
-    for (css::uno::Any t(type);;) {
-        css::uno::Reference< css::reflection::XIndirectTypeDescription > ind(
-            type, css::uno::UNO_QUERY);
-        if (!ind.is() || ind->getTypeClass() != css::uno::TypeClass_TYPEDEF) {
-            return t;
-        }
-        t = css::uno::makeAny(ind->getReferencedType());
+css::uno::Reference< css::reflection::XTypeDescription > resolve(
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    rtl::OUString const & name)
+{
+    assert(context.is());
+    try {
+        return css::uno::Reference< css::reflection::XTypeDescription >(
+            (css::uno::Reference< css::container::XHierarchicalNameAccess >(
+                context->getValueByName(
+                    "/singletons/"
+                    "com.sun.star.reflection.theTypeDescriptionManager"),
+                css::uno::UNO_QUERY_THROW)->
+             getByHierarchicalName(name)),
+            css::uno::UNO_QUERY_THROW);
+    } catch (css::container::NoSuchElementException & e) {
+        throw css::uno::DeploymentException(
+            ("cannot resolve type \"" + name + "\"; NoSuchElementException: "
+             + e.Message),
+            e.Context);
     }
 }
 
-class SimpleTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescription >
-{
-public:
-    SimpleTypeDescription(
-        css::uno::TypeClass typeClass, rtl::OUString const & name):
-        typeClass_(typeClass), name_(name)
-    {}
-
-private:
-    virtual ~SimpleTypeDescription() {}
-
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException)
-    { return typeClass_; }
-
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException)
-    { return name_; }
-
-    css::uno::TypeClass typeClass_;
-    rtl::OUString name_;
-};
-
-class SequenceTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XIndirectTypeDescription >
-{
-public:
-    SequenceTypeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
-        rtl::OUString const & name, rtl::OUString const & componentType):
-        manager_(manager), name_(name), componentType_(componentType)
-    { assert(manager.is()); }
-
-private:
-    virtual ~SequenceTypeDescription() {}
-
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException)
-    { return css::uno::TypeClass_SEQUENCE; }
-
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException)
-    { return name_; }
-
-    virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getReferencedType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(componentType_); }
-
-    rtl::Reference< cppuhelper::TypeManager > manager_;
-    rtl::OUString name_;
-    rtl::OUString componentType_;
-};
-
 class PublishableDescription:
-    public cppu::WeakImplHelper1< css::reflection::XPublished >
+    public cppu::WeakImplHelper1< css::reflection::XPublished >,
+    private boost::noncopyable
 {
 protected:
     PublishableDescription(bool published): published_(published) {}
@@ -140,15 +101,16 @@ private:
 };
 
 class ModuleDescription:
-    public cppu::WeakImplHelper1< css::reflection::XModuleTypeDescription >
+    public cppu::WeakImplHelper1< css::reflection::XModuleTypeDescription >,
+    private boost::noncopyable
 {
 public:
     ModuleDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::ModuleEntity > const & entity):
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~ModuleDescription() {}
@@ -165,7 +127,7 @@ private:
         css::uno::Reference< css::reflection::XTypeDescription > >
     SAL_CALL getMembers() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::ModuleEntity > entity_;
 };
@@ -179,7 +141,7 @@ ModuleDescription::getMembers() throw (css::uno::RuntimeException) {
         css::uno::Sequence<
             css::uno::Reference< css::reflection::XTypeDescription > > s(n);
         for (sal_Int32 i = 0; i != n; ++i) {
-            s[i] = manager_->resolve(name_ + "." + names[i]);
+            s[i] = resolve(context_, name_ + "." + names[i]);
         }
         return s;
     } catch (unoidl::FileFormatException & e) {
@@ -257,12 +219,12 @@ PlainStructTypeDescription_Base;
 class PlainStructTypeDescription: public PlainStructTypeDescription_Base {
 public:
     PlainStructTypeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::PlainStructTypeEntity > const & entity):
         PlainStructTypeDescription_Base(entity->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~PlainStructTypeDescription() {}
@@ -278,7 +240,7 @@ private:
     getBaseType() throw (css::uno::RuntimeException) {
         return entity_->getDirectBase().isEmpty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
-            : manager_->resolve(entity_->getDirectBase());
+            : resolve(context_, entity_->getDirectBase());
     }
 
     virtual
@@ -301,7 +263,7 @@ private:
             css::uno::Reference< css::reflection::XTypeDescription > >();
     }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::PlainStructTypeEntity > entity_;
 };
@@ -314,7 +276,7 @@ PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException)
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(entity_->getDirectMembers()[i].type);
+        s[i] = resolve(context_, entity_->getDirectMembers()[i].type);
     }
     return s;
 }
@@ -332,7 +294,8 @@ css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames()
 }
 
 class ParameterizedMemberTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescription >
+    public cppu::WeakImplHelper1< css::reflection::XTypeDescription >,
+    private boost::noncopyable
 {
 public:
     explicit ParameterizedMemberTypeDescription(
@@ -362,13 +325,13 @@ class PolymorphicStructTypeTemplateDescription:
 {
 public:
     PolymorphicStructTypeTemplateDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
             entity):
         PolymorphicStructTypeTemplateDescription_Base(entity->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~PolymorphicStructTypeTemplateDescription() {}
@@ -403,7 +366,7 @@ private:
             css::uno::Reference< css::reflection::XTypeDescription > >();
     }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
 };
@@ -420,7 +383,7 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes()
         s[i] = entity_->getMembers()[i].parameterized
             ? new ParameterizedMemberTypeDescription(
                 entity_->getMembers()[i].type)
-            : manager_->resolve(entity_->getMembers()[i].type);
+            : resolve(context_, entity_->getMembers()[i].type);
     }
     return s;
 }
@@ -451,114 +414,6 @@ PolymorphicStructTypeTemplateDescription::getTypeParameters()
     return s;
 }
 
-class InstantiatedPolymorphicStructTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XStructTypeDescription >
-{
-public:
-    InstantiatedPolymorphicStructTypeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
-        rtl::OUString const & name,
-        rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
-            entity,
-        std::vector< rtl::OUString > const & arguments):
-        manager_(manager), name_(name), entity_(entity), arguments_(arguments)
-    {
-        assert(manager.is());
-        assert(entity.is());
-        assert(arguments.size() == entity->getTypeParameters().size());
-    }
-
-private:
-    virtual ~InstantiatedPolymorphicStructTypeDescription() {}
-
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException)
-    { return css::uno::TypeClass_STRUCT; }
-
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException)
-    { return name_; }
-
-    virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException)
-    { return css::uno::Reference< css::reflection::XTypeDescription >(); }
-
-    virtual
-    css::uno::Sequence<
-        css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMemberTypes() throw (css::uno::RuntimeException);
-
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
-        throw (css::uno::RuntimeException);
-
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
-        throw (css::uno::RuntimeException)
-    { return css::uno::Sequence< rtl::OUString >(); }
-
-    virtual
-    css::uno::Sequence<
-        css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getTypeArguments() throw (css::uno::RuntimeException);
-
-    rtl::Reference< cppuhelper::TypeManager > manager_;
-    rtl::OUString name_;
-    rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
-    std::vector< rtl::OUString > arguments_;
-};
-
-css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
-    throw (css::uno::RuntimeException)
-{
-    assert(entity_->getMembers().size() <= SAL_MAX_INT32);
-    sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
-    css::uno::Sequence<
-        css::uno::Reference< css::reflection::XTypeDescription > > s(n);
-    for (sal_Int32 i = 0; i != n; ++i) {
-        rtl::OUString type(entity_->getMembers()[i].type);
-        if (entity_->getMembers()[i].parameterized) {
-            for (std::vector< rtl::OUString >::const_iterator j(
-                     entity_->getTypeParameters().begin());
-                 j != entity_->getTypeParameters().end(); ++j)
-            {
-                if (*j == type) {
-                    type = arguments_[j - entity_->getTypeParameters().begin()];
-                    goto found;
-                }
-            }
-            assert(false); // this cannot happen                         //TODO!
-        found:;
-        }
-        s[i] = manager_->resolve(type);
-    }
-    return s;
-}
-
-css::uno::Sequence< rtl::OUString >
-InstantiatedPolymorphicStructTypeDescription::getMemberNames()
-    throw (css::uno::RuntimeException)
-{
-    assert(entity_->getMembers().size() <= SAL_MAX_INT32);
-    sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
-    css::uno::Sequence< rtl::OUString > s(n);
-    for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = entity_->getMembers()[i].name;
-    }
-    return s;
-}
-css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-InstantiatedPolymorphicStructTypeDescription::getTypeArguments()
-    throw (css::uno::RuntimeException)
-{
-    assert(arguments_.size() <= SAL_MAX_INT32);
-    sal_Int32 n = static_cast< sal_Int32 >(arguments_.size());
-    css::uno::Sequence<
-        css::uno::Reference< css::reflection::XTypeDescription > > s(n);
-    for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(arguments_[i]);
-    }
-    return s;
-}
-
 typedef cppu::ImplInheritanceHelper1<
     PublishableDescription, css::reflection::XCompoundTypeDescription >
 ExceptionTypeDescription_Base;
@@ -566,12 +421,12 @@ ExceptionTypeDescription_Base;
 class ExceptionTypeDescription: public ExceptionTypeDescription_Base {
 public:
     ExceptionTypeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::ExceptionTypeEntity > const & entity):
-        ExceptionTypeDescription_Base(entity->isPublished()), manager_(manager),
+        ExceptionTypeDescription_Base(entity->isPublished()), context_(context),
         name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+    { assert(entity.is()); }
 
 private:
     virtual ~ExceptionTypeDescription() {}
@@ -587,7 +442,7 @@ private:
     getBaseType() throw (css::uno::RuntimeException) {
         return entity_->getDirectBase().isEmpty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
-            : manager_->resolve(entity_->getDirectBase());
+            : resolve(context_, entity_->getDirectBase());
     }
 
     virtual
@@ -598,7 +453,7 @@ private:
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
         throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::ExceptionTypeEntity > entity_;
 };
@@ -610,7 +465,7 @@ ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) {
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(entity_->getDirectMembers()[i].type);
+        s[i] = resolve(context_, entity_->getDirectMembers()[i].type);
     }
     return s;
 }
@@ -627,19 +482,86 @@ css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames()
     return s;
 }
 
+css::uno::Reference< css::reflection::XTypeDescription > resolveTypedefs(
+    css::uno::Reference< css::reflection::XTypeDescription > const & type)
+{
+    css::uno::Reference< css::reflection::XTypeDescription > resolved(type);
+    while (resolved->getTypeClass() == css::uno::TypeClass_TYPEDEF) {
+        resolved
+            = (css::uno::Reference< css::reflection::XIndirectTypeDescription >(
+                   resolved, css::uno::UNO_QUERY_THROW)->
+               getReferencedType());
+    }
+    return resolved;
+}
+
+class BaseOffset: private boost::noncopyable {
+public:
+    BaseOffset(
+        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
+            const & description);
+
+    sal_Int32 get() const { return offset_; }
+
+private:
+    void calculateBases(
+        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
+            const & description);
+
+    void calculate(
+        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
+            const & description);
+
+    std::set< rtl::OUString > set_;
+    sal_Int32 offset_;
+};
+
+BaseOffset::BaseOffset(
+    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
+        description):
+    offset_(0)
+{
+    calculateBases(description);
+}
+
+void BaseOffset::calculateBases(
+    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
+        description)
+{
+    css::uno::Sequence<
+        css::uno::Reference < css::reflection::XTypeDescription > > bases(
+            description->getBaseTypes());
+    for (sal_Int32 i = 0; i != bases.getLength(); ++i) {
+        calculate(
+            css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >(
+                resolveTypedefs(bases[i]), css::uno::UNO_QUERY_THROW));
+    }
+}
+
+void BaseOffset::calculate(
+    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
+        description)
+{
+    if (set_.insert(description->getName()).second) {
+        calculateBases(description);
+        offset_ += description->getMembers().getLength();
+    }
+}
+
 class AttributeDescription:
     public cppu::WeakImplHelper1<
-        css::reflection::XInterfaceAttributeTypeDescription2 >
+        css::reflection::XInterfaceAttributeTypeDescription2 >,
+    private boost::noncopyable
 {
 public:
     AttributeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         unoidl::InterfaceTypeEntity::Attribute const & attribute,
         sal_Int32 position):
-        manager_(manager), name_(name), attribute_(attribute),
+        context_(context), name_(name), attribute_(attribute),
         position_(position)
-    { assert(manager.is()); }
+    {}
 
 private:
     virtual ~AttributeDescription() {}
@@ -663,7 +585,7 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(attribute_.type); }
+    { return resolve(context_, attribute_.type); }
 
     virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException)
     { return attribute_.bound; }
@@ -678,7 +600,7 @@ private:
         css::uno::Reference< css::reflection::XCompoundTypeDescription > >
     SAL_CALL getSetExceptions() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     unoidl::InterfaceTypeEntity::Attribute attribute_;
     sal_Int32 position_;
@@ -693,7 +615,7 @@ AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException) {
         css::uno::Reference< css::reflection::XCompoundTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
-            manager_->resolve(attribute_.getExceptions[i]),
+            resolve(context_, attribute_.getExceptions[i]),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -708,22 +630,23 @@ AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException) {
         css::uno::Reference< css::reflection::XCompoundTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
-            manager_->resolve(attribute_.setExceptions[i]),
+            resolve(context_, attribute_.setExceptions[i]),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
 }
 
 class MethodParameter:
-    public cppu::WeakImplHelper1< css::reflection::XMethodParameter >
+    public cppu::WeakImplHelper1< css::reflection::XMethodParameter >,
+    private boost::noncopyable
 {
 public:
     MethodParameter(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         unoidl::InterfaceTypeEntity::Method::Parameter const & parameter,
         sal_Int32 position):
-        manager_(manager), parameter_(parameter), position_(position)
-    { assert(manager.is()); }
+        context_(context), parameter_(parameter), position_(position)
+    {}
 
 private:
     virtual ~MethodParameter() {}
@@ -733,7 +656,7 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(parameter_.type); }
+    { return resolve(context_, parameter_.type); }
 
     virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException) {
         return
@@ -756,22 +679,23 @@ private:
     virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException)
     { return position_; }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     unoidl::InterfaceTypeEntity::Method::Parameter parameter_;
     sal_Int32 position_;
 };
 
 class MethodDescription:
     public cppu::WeakImplHelper1<
-        css::reflection::XInterfaceMethodTypeDescription >
+        css::reflection::XInterfaceMethodTypeDescription >,
+    private boost::noncopyable
 {
 public:
     MethodDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         unoidl::InterfaceTypeEntity::Method const & method, sal_Int32 position):
-        manager_(manager), name_(name), method_(method), position_(position)
-    { assert(manager.is()); }
+        context_(context), name_(name), method_(method), position_(position)
+    {}
 
 private:
     virtual ~MethodDescription() {}
@@ -792,7 +716,7 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getReturnType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(method_.returnType); }
+    { return resolve(context_, method_.returnType); }
 
     virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException)
     { return false; }
@@ -807,7 +731,7 @@ private:
         css::uno::Reference< css::reflection::XTypeDescription > >
     SAL_CALL getExceptions() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     unoidl::InterfaceTypeEntity::Method method_;
     sal_Int32 position_;
@@ -820,7 +744,7 @@ MethodDescription::getParameters() throw (css::uno::RuntimeException) {
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XMethodParameter > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = new MethodParameter(manager_, method_.parameters[i], i);
+        s[i] = new MethodParameter(context_, method_.parameters[i], i);
     }
     return s;
 }
@@ -832,65 +756,11 @@ MethodDescription::getExceptions() throw (css::uno::RuntimeException) {
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(method_.exceptions[i]);
+        s[i] = resolve(context_, method_.exceptions[i]);
     }
     return s;
 }
 
-class BaseOffset: private boost::noncopyable {
-public:
-    BaseOffset(
-        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
-            const & description);
-
-    sal_Int32 get() const { return offset_; }
-
-private:
-    void calculateBases(
-        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
-            const & description);
-
-    void calculate(
-        css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
-            const & description);
-
-    std::set< rtl::OUString > set_;
-    sal_Int32 offset_;
-};
-
-BaseOffset::BaseOffset(
-    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
-        description):
-    offset_(0)
-{
-    calculateBases(description);
-}
-
-void BaseOffset::calculateBases(
-    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
-        description)
-{
-    css::uno::Sequence<
-        css::uno::Reference < css::reflection::XTypeDescription > > bases(
-            description->getBaseTypes());
-    for (sal_Int32 i = 0; i != bases.getLength(); ++i) {
-        calculate(
-            css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >(
-                resolveTypedefs(css::uno::makeAny(bases[i])),
-                css::uno::UNO_QUERY_THROW));
-    }
-}
-
-void BaseOffset::calculate(
-    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const &
-        description)
-{
-    if (set_.insert(description->getName()).second) {
-        calculateBases(description);
-        offset_ += description->getMembers().getLength();
-    }
-}
-
 typedef cppu::ImplInheritanceHelper1<
     PublishableDescription, css::reflection::XInterfaceTypeDescription2 >
 InterfaceTypeDescription_Base;
@@ -898,12 +768,12 @@ InterfaceTypeDescription_Base;
 class InterfaceTypeDescription: public InterfaceTypeDescription_Base {
 public:
     InterfaceTypeDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::InterfaceTypeEntity > const & entity):
-        InterfaceTypeDescription_Base(entity->isPublished()), manager_(manager),
+        InterfaceTypeDescription_Base(entity->isPublished()), context_(context),
         name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+    { assert(entity.is()); }
 
 private:
     virtual ~InterfaceTypeDescription() {}
@@ -919,7 +789,7 @@ private:
     getBaseType() throw (css::uno::RuntimeException) {
         return entity_->getDirectMandatoryBases().empty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
-            : manager_->resolve(entity_->getDirectMandatoryBases()[0]);
+            : resolve(context_, entity_->getDirectMandatoryBases()[0]);
     }
 
     virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException)
@@ -941,7 +811,7 @@ private:
         css::uno::Reference< css::reflection::XTypeDescription > >
     SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::InterfaceTypeEntity > entity_;
 };
@@ -962,12 +832,12 @@ InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException) {
     sal_Int32 off = BaseOffset(this).get();
     for (sal_Int32 i = 0; i != n1; ++i) {
         s[i] = new AttributeDescription(
-            manager_, name_ + "::" + entity_->getDirectAttributes()[i].name,
+            context_, name_ + "::" + entity_->getDirectAttributes()[i].name,
             entity_->getDirectAttributes()[i], off + i);
     }
     for (sal_Int32 i = 0; i != n2; ++i) {
         s[n1 + i] = new MethodDescription(
-            manager_, name_ + "::" + entity_->getDirectMethods()[i].name,
+            context_, name_ + "::" + entity_->getDirectMethods()[i].name,
             entity_->getDirectMethods()[i], off + n1 + i);
     }
     return s;
@@ -981,7 +851,7 @@ InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException) {
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(entity_->getDirectMandatoryBases()[i]);
+        s[i] = resolve(context_, entity_->getDirectMandatoryBases()[i]);
     }
     return s;
 }
@@ -996,17 +866,20 @@ InterfaceTypeDescription::getOptionalBaseTypes()
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = manager_->resolve(entity_->getDirectOptionalBases()[i]);
+        s[i] = resolve(context_, entity_->getDirectOptionalBases()[i]);
     }
     return s;
 }
 
 class ConstantDescription:
-    public cppu::WeakImplHelper1< css::reflection::XConstantTypeDescription >
+    public cppu::WeakImplHelper1< css::reflection::XConstantTypeDescription >,
+    private boost::noncopyable
 {
 public:
-    explicit ConstantDescription(
-        unoidl::ConstantGroupEntity::Member const & member);
+    ConstantDescription(
+        rtl::OUString const & name, css::uno::Any const & value):
+        name_(name), value_(value)
+    {}
 
 private:
     virtual ~ConstantDescription() {}
@@ -1026,46 +899,6 @@ private:
     css::uno::Any value_;
 };
 
-ConstantDescription::ConstantDescription(
-    unoidl::ConstantGroupEntity::Member const & member):
-    name_(member.name)
-{
-    switch (member.value.type) {
-    case unoidl::ConstantValue::TYPE_BOOLEAN:
-        value_ <<= member.value.booleanValue;
-        break;
-    case unoidl::ConstantValue::TYPE_BYTE:
-        value_ <<= member.value.byteValue;
-        break;
-    case unoidl::ConstantValue::TYPE_SHORT:
-        value_ <<= member.value.shortValue;
-        break;
-    case unoidl::ConstantValue::TYPE_UNSIGNED_SHORT:
-        value_ <<= member.value.unsignedShortValue;
-        break;
-    case unoidl::ConstantValue::TYPE_LONG:
-        value_ <<= member.value.longValue;
-        break;
-    case unoidl::ConstantValue::TYPE_UNSIGNED_LONG:
-        value_ <<= member.value.unsignedLongValue;
-        break;
-    case unoidl::ConstantValue::TYPE_HYPER:
-        value_ <<= member.value.hyperValue;
-        break;
-    case unoidl::ConstantValue::TYPE_UNSIGNED_HYPER:
-        value_ <<= member.value.unsignedHyperValue;
-        break;
-    case unoidl::ConstantValue::TYPE_FLOAT:
-        value_ <<= member.value.floatValue;
-        break;
-    case unoidl::ConstantValue::TYPE_DOUBLE:
-        value_ <<= member.value.doubleValue;
-        break;
-    default:
-        for (;;) { std::abort(); } // this cannot happen
-    }
-}
-
 typedef cppu::ImplInheritanceHelper1<
     PublishableDescription, css::reflection::XConstantsTypeDescription >
 ConstantGroupDescription_Base;
@@ -1073,10 +906,11 @@ ConstantGroupDescription_Base;
 class ConstantGroupDescription: public ConstantGroupDescription_Base {
 public:
     ConstantGroupDescription(
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::ConstantGroupEntity > const & entity):
-        ConstantGroupDescription_Base(entity->isPublished()), name_(name),
-        entity_(entity)
+        ConstantGroupDescription_Base(entity->isPublished()), context_(context),
+        name_(name), entity_(entity)
     { assert(entity.is()); }
 
 private:
@@ -1094,6 +928,7 @@ private:
         css::uno::Reference< css::reflection::XConstantTypeDescription > >
     SAL_CALL getConstants() throw (css::uno::RuntimeException);
 
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::ConstantGroupEntity > entity_;
 };
@@ -1106,7 +941,10 @@ ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException) {
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XConstantTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
-        s[i] = new ConstantDescription(entity_->getMembers()[i]);
+        //TODO: use entity_->getMembers()[i].value directly?
+        s[i].set(
+            resolve(context_, name_ + "." + entity_->getMembers()[i].name),
+            css::uno::UNO_QUERY_THROW);
     }
     return s;
 }
@@ -1118,12 +956,12 @@ TypedefDescription_Base;
 class TypedefDescription: public TypedefDescription_Base {
 public:
     TypedefDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::TypedefEntity > const & entity):
-        TypedefDescription_Base(entity->isPublished()), manager_(manager),
+        TypedefDescription_Base(entity->isPublished()), context_(context),
         name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+    { assert(entity.is()); }
 
 private:
     virtual ~TypedefDescription() {}
@@ -1137,24 +975,25 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getReferencedType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(entity_->getType()); }
+    { return resolve(context_, entity_->getType()); }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::TypedefEntity > entity_;
 };
 
 class ConstructorParameter:
-    public cppu::WeakImplHelper1< css::reflection::XParameter >
+    public cppu::WeakImplHelper1< css::reflection::XParameter >,
+    private boost::noncopyable
 {
 public:
     ConstructorParameter(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
             const & parameter,
         sal_Int32 position):
-        manager_(manager), parameter_(parameter), position_(position)
-    { assert(manager.is()); }
+        context_(context), parameter_(parameter), position_(position)
+    {}
 
 private:
     virtual ~ConstructorParameter() {}
@@ -1164,7 +1003,7 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getType() throw (css::uno::RuntimeException)
-    { return manager_->resolve(parameter_.type); }
+    { return resolve(context_, parameter_.type); }
 
     virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException)
     { return true; }
@@ -1179,7 +1018,7 @@ private:
         throw (css::uno::RuntimeException)
     { return parameter_.rest; }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
         parameter_;
     sal_Int32 position_;
@@ -1187,15 +1026,16 @@ private:
 
 class ConstructorDescription:
     public cppu::WeakImplHelper1<
-        css::reflection::XServiceConstructorDescription >
+        css::reflection::XServiceConstructorDescription >,
+    private boost::noncopyable
 {
 public:
     ConstructorDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         unoidl::SingleInterfaceBasedServiceEntity::Constructor const &
             constructor):
-        manager_(manager), constructor_(constructor)
-    { assert(manager.is()); }
+        context_(context), constructor_(constructor)
+    {}
 
 private:
     virtual ~ConstructorDescription() {}
@@ -1217,7 +1057,7 @@ private:
         css::uno::Reference< css::reflection::XCompoundTypeDescription > >
     SAL_CALL getExceptions() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_;
 };
 
@@ -1229,7 +1069,7 @@ ConstructorDescription::getParameters() throw (css::uno::RuntimeException) {
         n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i] = new ConstructorParameter(
-            manager_, constructor_.parameters[i], i);
+            context_, constructor_.parameters[i], i);
     }
     return s;
 }
@@ -1243,7 +1083,7 @@ ConstructorDescription::getExceptions() throw (css::uno::RuntimeException) {
         css::uno::Reference< css::reflection::XCompoundTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
-            manager_->resolve(constructor_.exceptions[i]),
+            resolve(context_, constructor_.exceptions[i]),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -1258,13 +1098,13 @@ class SingleInterfaceBasedServiceDescription:
 {
 public:
     SingleInterfaceBasedServiceDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > const &
             entity):
         SingleInterfaceBasedServiceDescription_Base(entity->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~SingleInterfaceBasedServiceDescription() {}
@@ -1330,14 +1170,14 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getInterface() throw (css::uno::RuntimeException)
-    { return manager_->resolve(entity_->getBase()); }
+    { return resolve(context_, entity_->getBase()); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceConstructorDescription > >
     SAL_CALL getConstructors() throw (css::uno::RuntimeException);
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > entity_;
 };
@@ -1354,20 +1194,21 @@ SingleInterfaceBasedServiceDescription::getConstructors()
             s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i] = new ConstructorDescription(
-            manager_, entity_->getConstructors()[i]);
+            context_, entity_->getConstructors()[i]);
     }
     return s;
 }
 
 class PropertyDescription:
-    public cppu::WeakImplHelper1< css::reflection::XPropertyTypeDescription >
+    public cppu::WeakImplHelper1< css::reflection::XPropertyTypeDescription >,
+    private boost::noncopyable
 {
 public:
     PropertyDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         unoidl::AccumulationBasedServiceEntity::Property const & property):
-        manager_(manager), property_(property)
-    { assert(manager.is()); }
+        context_(context), property_(property)
+    {}
 
 private:
     virtual ~PropertyDescription() {}
@@ -1385,9 +1226,9 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
     getPropertyTypeDescription() throw (css::uno::RuntimeException)
-    { return manager_->resolve(property_.type); }
+    { return resolve(context_, property_.type); }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     unoidl::AccumulationBasedServiceEntity::Property property_;
 };
 
@@ -1400,13 +1241,13 @@ class AccumulationBasedServiceDescription:
 {
 public:
     AccumulationBasedServiceDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::AccumulationBasedServiceEntity > const &
             entity):
         AccumulationBasedServiceDescription_Base(entity->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~AccumulationBasedServiceDescription() {}
@@ -1461,7 +1302,7 @@ private:
                 css::reflection::XServiceConstructorDescription > >();
     }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::AccumulationBasedServiceEntity > entity_;
 };
@@ -1478,7 +1319,7 @@ AccumulationBasedServiceDescription::getMandatoryServices()
         css::uno::Reference< css::reflection::XServiceTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
-            manager_->resolve(entity_->getDirectMandatoryBaseServices()[i]),
+            resolve(context_, entity_->getDirectMandatoryBaseServices()[i]),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -1496,7 +1337,7 @@ AccumulationBasedServiceDescription::getOptionalServices()
         css::uno::Reference< css::reflection::XServiceTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
-            manager_->resolve(entity_->getDirectOptionalBaseServices()[i]),
+            resolve(context_, entity_->getDirectOptionalBaseServices()[i]),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -1516,8 +1357,8 @@ AccumulationBasedServiceDescription::getMandatoryInterfaces()
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
             resolveTypedefs(
-                manager_->find(
-                    entity_->getDirectMandatoryBaseInterfaces()[i])),
+                resolve(
+                    context_, entity_->getDirectMandatoryBaseInterfaces()[i])),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -1537,8 +1378,8 @@ AccumulationBasedServiceDescription::getOptionalInterfaces()
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i].set(
             resolveTypedefs(
-                manager_->find(
-                    entity_->getDirectOptionalBaseInterfaces()[i])),
+                resolve(
+                    context_, entity_->getDirectOptionalBaseInterfaces()[i])),
             css::uno::UNO_QUERY_THROW);
     }
     return s;
@@ -1556,7 +1397,7 @@ AccumulationBasedServiceDescription::getProperties()
         css::uno::Reference< css::reflection::XPropertyTypeDescription > > s(n);
     for (sal_Int32 i = 0; i != n; ++i) {
         s[i] = new PropertyDescription(
-            manager_, entity_->getDirectProperties()[i]);
+            context_, entity_->getDirectProperties()[i]);
     }
     return s;
 }
@@ -1570,12 +1411,12 @@ class InterfaceBasedSingletonDescription:
 {
 public:
     InterfaceBasedSingletonDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::InterfaceBasedSingletonEntity > const & entity):
         InterfaceBasedSingletonDescription_Base(entity->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~InterfaceBasedSingletonDescription() {}
@@ -1600,9 +1441,9 @@ private:
 
     virtual css::uno::Reference< css::reflection::XTypeDescription >
     SAL_CALL getInterface() throw (css::uno::RuntimeException)
-    { return manager_->resolve(entity_->getBase()); }
+    { return resolve(context_, entity_->getBase()); }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_;
 };
@@ -1616,12 +1457,12 @@ class ServiceBasedSingletonDescription:
 {
 public:
     ServiceBasedSingletonDescription(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & name,
         rtl::Reference< unoidl::ServiceBasedSingletonEntity > const & entity):
         ServiceBasedSingletonDescription_Base(entity_->isPublished()),
-        manager_(manager), name_(name), entity_(entity)
-    { assert(manager.is()); assert(entity.is()); }
+        context_(context), name_(name), entity_(entity)
+    { assert(entity.is()); }
 
 private:
     virtual ~ServiceBasedSingletonDescription() {}
@@ -1637,7 +1478,7 @@ private:
     SAL_CALL getService() throw (css::uno::RuntimeException)
     {
         return css::uno::Reference< css::reflection::XServiceTypeDescription >(
-            manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW);
+            resolve(context_, entity_->getBase()), css::uno::UNO_QUERY_THROW);
     }
 
     virtual sal_Bool SAL_CALL isInterfaceBased()
@@ -1648,23 +1489,24 @@ private:
     SAL_CALL getInterface() throw (css::uno::RuntimeException)
     { return css::uno::Reference< css::reflection::XTypeDescription >(); }
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString name_;
     rtl::Reference< unoidl::ServiceBasedSingletonEntity > entity_;
 };
 
 class Enumeration:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescriptionEnumeration >
+    public cppu::WeakImplHelper1<
+        css::reflection::XTypeDescriptionEnumeration >,
+    private boost::noncopyable
 {
 public:
     Enumeration(
-        rtl::Reference< cppuhelper::TypeManager > const & manager,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         rtl::OUString const & prefix,
         rtl::Reference< unoidl::MapCursor > const & cursor,
         css::uno::Sequence< css::uno::TypeClass > const & types, bool deep):
-        manager_(manager), types_(types), deep_(deep)
+        context_(context), types_(types), deep_(deep)
     {
-        assert(manager.is());
         positions_.push(Position(prefix, cursor));
         findNextMatch();
     }
@@ -1713,7 +1555,7 @@ private:
             constantGroupIndex;
     };
 
-    rtl::Reference< cppuhelper::TypeManager > manager_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
     css::uno::Sequence< css::uno::TypeClass > types_;
     bool deep_;
 
@@ -1737,7 +1579,7 @@ Enumeration::nextTypeDescription()
         name = current_;
         findNextMatch();
     }
-    return manager_->resolve(name);
+    return resolve(context_, name);
 }
 
 bool Enumeration::matches(css::uno::TypeClass tc) const {
@@ -1843,259 +1685,324 @@ void Enumeration::findNextMatch() {
     }
 }
 
-}
+typedef cppu::WeakComponentImplHelper2<
+    css::container::XHierarchicalNameAccess,
+    css::reflection::XTypeDescriptionEnumerationAccess >
+Provider_Base;
 
-cppuhelper::TypeManager::TypeManager(rtl::OUString const & rdbUris):
-    TypeManager_Base(*static_cast< osl::Mutex * >(this)),
-    manager_(new unoidl::Manager)
+class Provider:
+    private osl::Mutex, public Provider_Base, private boost::noncopyable
 {
-    readRdbs(rdbUris);
-}
+public:
+    // throws unoidl::FileFormatException, unoidl::NoSuchFileException:
+    Provider(
+        css::uno::Reference< css::uno::XComponentContext > const & context,
+        rtl::OUString const & uri):
+        Provider_Base(*static_cast< osl::Mutex * >(this)), context_(context),
+        provider_(new unoidl::UnoidlProvider(uri))
+    {}
 
-css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
-    //TODO: caching? (here or in unoidl::Manager?)
-    struct Simple {
-        char const * name; sal_Int32 length;
-        css::uno::TypeClass typeClass;
-    };
-    static Simple const simple[] = {
-        { RTL_CONSTASCII_STRINGPARAM("void"), css::uno::TypeClass_VOID },
-        { RTL_CONSTASCII_STRINGPARAM("boolean"), css::uno::TypeClass_BOOLEAN },
-        { RTL_CONSTASCII_STRINGPARAM("byte"), css::uno::TypeClass_BYTE },
-        { RTL_CONSTASCII_STRINGPARAM("short"), css::uno::TypeClass_SHORT },
-        { RTL_CONSTASCII_STRINGPARAM("unsigned short"),
-          css::uno::TypeClass_UNSIGNED_SHORT },
-        { RTL_CONSTASCII_STRINGPARAM("long"), css::uno::TypeClass_LONG },
-        { RTL_CONSTASCII_STRINGPARAM("unsigned long"),
-          css::uno::TypeClass_UNSIGNED_LONG },
-        { RTL_CONSTASCII_STRINGPARAM("hyper"), css::uno::TypeClass_HYPER },
-        { RTL_CONSTASCII_STRINGPARAM("unsigned hyper"),
-          css::uno::TypeClass_UNSIGNED_HYPER },
-        { RTL_CONSTASCII_STRINGPARAM("float"), css::uno::TypeClass_FLOAT },
-        { RTL_CONSTASCII_STRINGPARAM("double"), css::uno::TypeClass_DOUBLE },
-        { RTL_CONSTASCII_STRINGPARAM("char"), css::uno::TypeClass_CHAR },
-        { RTL_CONSTASCII_STRINGPARAM("string"), css::uno::TypeClass_STRING },
-        { RTL_CONSTASCII_STRINGPARAM("type"), css::uno::TypeClass_TYPE },
-        { RTL_CONSTASCII_STRINGPARAM("any"), css::uno::TypeClass_ANY } };
-    for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) {
-        if (name.equalsAsciiL(simple[i].name, simple[i].length)) {
+    using Provider_Base::acquire;
+    using Provider_Base::release;
+
+private:
+    virtual ~Provider() {}
+
+    virtual void SAL_CALL disposing() {} //TODO
+
+    virtual css::uno::Any SAL_CALL getByHierarchicalName(
+        rtl::OUString const & aName)
+        throw (
+            css::container::NoSuchElementException, css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(
+        rtl::OUString const & aName) throw (css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
+    SAL_CALL createTypeDescriptionEnumeration(
+        rtl::OUString const & moduleName,
+        css::uno::Sequence< css::uno::TypeClass > const & types,
+        css::reflection::TypeDescriptionSearchDepth depth)
+        throw(
+            css::reflection::NoSuchTypeNameException,
+            css::reflection::InvalidTypeNameException,
+            css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+    rtl::Reference< unoidl::UnoidlProvider > provider_;
+};
+
+css::uno::Any Provider::getByHierarchicalName(rtl::OUString const & aName)
+    throw (css::container::NoSuchElementException, css::uno::RuntimeException)
+{
+    try {
+        bool cnst;
+        sal_uInt32 off = provider_->find(aName, &cnst);
+        if (off == 0) {
+            throw css::container::NoSuchElementException(
+                aName, static_cast< cppu::OWeakObject * >(this));
+        }
+        if (cnst) {
+            unoidl::ConstantValue val1(provider_->getConstant(off));
+            css::uno::Any val2;
+            switch (val1.type) {
+            case unoidl::ConstantValue::TYPE_BOOLEAN:
+                val2 <<= val1.booleanValue;
+                break;
+            case unoidl::ConstantValue::TYPE_BYTE:
+                val2 <<= val1.byteValue;
+                break;
+            case unoidl::ConstantValue::TYPE_SHORT:
+                val2 <<= val1.shortValue;
+                break;
+            case unoidl::ConstantValue::TYPE_UNSIGNED_SHORT:
+                val2 <<= val1.unsignedShortValue;
+                break;
+            case unoidl::ConstantValue::TYPE_LONG:
+                val2 <<= val1.longValue;
+                break;
+            case unoidl::ConstantValue::TYPE_UNSIGNED_LONG:
+                val2 <<= val1.unsignedLongValue;
+                break;
+            case unoidl::ConstantValue::TYPE_HYPER:
+                val2 <<= val1.hyperValue;
+                break;
+            case unoidl::ConstantValue::TYPE_UNSIGNED_HYPER:
+                val2 <<= val1.unsignedHyperValue;
+                break;
+            case unoidl::ConstantValue::TYPE_FLOAT:
+                val2 <<= val1.floatValue;
+                break;
+            case unoidl::ConstantValue::TYPE_DOUBLE:
+                val2 <<= val1.doubleValue;
+                break;
+            default:
+                for (;;) { std::abort(); } // this cannot happen
+            }
             return css::uno::makeAny<
                 css::uno::Reference< css::reflection::XTypeDescription > >(
-                    new SimpleTypeDescription(simple[i].typeClass, name));
-        }
-    }
-    if (name.match("[]")) {
-        return getSequenceType(name);
-    }
-    sal_Int32 i = name.indexOf('<');
-    if (i != -1) {
-        return getInstantiatedStruct(name, i);
-    }
-    i = name.indexOf("::");
-    if (i != -1) {
-        return getInterfaceMember(name, i);
-    }
-    rtl::Reference< unoidl::Entity > ent(findEntity(name));
-    if (ent.is()) {
-        return getNamed(name, ent);
-    }
-    i = name.lastIndexOf('.');
-    if (i != -1) {
-        ent = findEntity(name.copy(0, i));
-        if (ent.is()) {
+                    new ConstantDescription(aName, val2));
+        } else {
+            rtl::Reference< unoidl::Entity > ent(provider_->getEntity(off));
             switch (ent->getSort()) {
+            case unoidl::Entity::SORT_MODULE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new ModuleDescription(
+                            context_, aName,
+                            static_cast< unoidl::ModuleEntity * >(ent.get())));
             case unoidl::Entity::SORT_ENUM_TYPE:
-                return getEnumMember(
-                    static_cast< unoidl::EnumTypeEntity * >(ent.get()),
-                    name.copy(i + 1));
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new EnumTypeDescription(
+                            aName,
+                            static_cast< unoidl::EnumTypeEntity * >(
+                                ent.get())));
+            case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new PlainStructTypeDescription(
+                            context_, aName,
+                            static_cast< unoidl::PlainStructTypeEntity * >(
+                                ent.get())));
+            case unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new PolymorphicStructTypeTemplateDescription(
+                            context_, aName,
+                            static_cast<
+                                unoidl::PolymorphicStructTypeTemplateEntity * >(
+                                    ent.get())));
+            case unoidl::Entity::SORT_EXCEPTION_TYPE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new ExceptionTypeDescription(
+                            context_, aName,
+                            static_cast< unoidl::ExceptionTypeEntity * >(
+                                ent.get())));
+            case unoidl::Entity::SORT_INTERFACE_TYPE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new InterfaceTypeDescription(
+                            context_, aName,
+                            static_cast< unoidl::InterfaceTypeEntity * >(
+                                ent.get())));
+            case unoidl::Entity::SORT_TYPEDEF:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new TypedefDescription(
+                            context_, aName,
+                            static_cast< unoidl::TypedefEntity * >(ent.get())));
             case unoidl::Entity::SORT_CONSTANT_GROUP:
-                return getConstant(
-                    static_cast< unoidl::ConstantGroupEntity * >(ent.get()),
-                    name.copy(i + 1));
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new ConstantGroupDescription(
+                            context_, aName,
+                            static_cast< unoidl::ConstantGroupEntity * >(
+                                ent.get())));
+            case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new SingleInterfaceBasedServiceDescription(
+                            context_, aName,
+                            static_cast<
+                                unoidl::SingleInterfaceBasedServiceEntity * >(
+                                    ent.get())));
+            case unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new AccumulationBasedServiceDescription(
+                            context_, aName,
+                            static_cast<
+                                unoidl::AccumulationBasedServiceEntity * >(
+                                    ent.get())));
+            case unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new InterfaceBasedSingletonDescription(
+                            context_, aName,
+                            static_cast<
+                                unoidl::InterfaceBasedSingletonEntity * >(
+                                    ent.get())));
+            case unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
+                return css::uno::makeAny<
+                    css::uno::Reference< css::reflection::XTypeDescription > >(
+                        new ServiceBasedSingletonDescription(
+                            context_, aName,
+                            static_cast<
+                                unoidl::ServiceBasedSingletonEntity * >(
+                                    ent.get())));
             default:
-                break;
+                for (;;) { std::abort(); } // this cannot happen
             }
         }
-    }
-    return css::uno::Any();
-}
-
-css::uno::Reference< css::reflection::XTypeDescription >
-cppuhelper::TypeManager::resolve(rtl::OUString const & name) {
-    css::uno::Reference< css::reflection::XTypeDescription > desc(
-        find(name), css::uno::UNO_QUERY);
-    if (!desc.is()) {
+    } catch (unoidl::FileFormatException & e) {
         throw css::uno::DeploymentException(
-            "cannot resolve type \"" + name + "\"",
+            e.getUri() + ": " + e.getDetail(),
             static_cast< cppu::OWeakObject * >(this));
     }
-    return desc;
 }
 
-cppuhelper::TypeManager::~TypeManager() throw () {}
-
-void cppuhelper::TypeManager::disposing() {} //TODO
-
-rtl::OUString cppuhelper::TypeManager::getImplementationName()
-    throw (css::uno::RuntimeException)
-{
-    return rtl::OUString(
-        "com.sun.star.comp.cppuhelper.bootstrap.TypeManager");
-}
-
-sal_Bool cppuhelper::TypeManager::supportsService(
-    rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException)
-{
-    return cppu::supportsService(this, ServiceName);
-}
-
-css::uno::Sequence< rtl::OUString >
-cppuhelper::TypeManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
-{
-    css::uno::Sequence< rtl::OUString > names(1);
-    names[0] = "com.sun.star.reflection.TypeDescriptionManager"; //TODO
-    return names;
-}
-
-css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
-    rtl::OUString const & aName)
-    throw (css::container::NoSuchElementException, css::uno::RuntimeException)
-{
-    css::uno::Any desc(find(aName));
-    if (!desc.hasValue()) {
-        throw css::container::NoSuchElementException(
-            aName, static_cast< cppu::OWeakObject * >(this));
-    }
-    return desc;
-}
-
-sal_Bool cppuhelper::TypeManager::hasByHierarchicalName(
-    rtl::OUString const & aName)
-    throw (css::uno::RuntimeException)
-{
-    return find(aName).hasValue();
-}
-
-css::uno::Type cppuhelper::TypeManager::getElementType()
-    throw (css::uno::RuntimeException)
-{
-    return cppu::UnoType< rtl::OUString >::get();
-}
-
-sal_Bool cppuhelper::TypeManager::hasElements()
-    throw (css::uno::RuntimeException)
-{
-    throw css::uno::RuntimeException(
-        "TypeManager hasElements: method not supported",
-        static_cast< cppu::OWeakObject * >(this));
-}
-
-css::uno::Reference< css::container::XEnumeration >
-cppuhelper::TypeManager::createEnumeration()
-    throw (css::uno::RuntimeException)
+sal_Bool Provider::hasByHierarchicalName(
+    rtl::OUString const & aName) throw (css::uno::RuntimeException)
 {
-    throw css::uno::RuntimeException(
-        "TypeManager createEnumeration: method not supported",
-        static_cast< cppu::OWeakObject * >(this));
-}
-
-sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
-    throw (css::uno::RuntimeException)
-{
-    throw css::uno::RuntimeException(
-        "TypeManager has: method not supported",
-        static_cast< cppu::OWeakObject * >(this));
-}
-
-void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::ElementExistException, css::uno::RuntimeException)
-{
-    rtl::OUString uri;
-    if (!(aElement >>= uri)) {
-        throw css::lang::IllegalArgumentException(
-            ("css.uno.theTypeDescriptionManager.insert expects a string URI"
-             " argument"),
-            static_cast< cppu::OWeakObject * >(this), 0);
-    }
-    //TODO: check for ElementExistException
-    //TODO: check for consistency with existing data
-    readRdbFile(uri, false);
-}
-
-void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::NoSuchElementException, css::uno::RuntimeException)
-{
-    rtl::OUString uri;
-    if (!(aElement >>= uri)) {
-        throw css::lang::IllegalArgumentException(
-            ("css.uno.theTypeDescriptionManager.remove expects a string URI"
-             " argument"),
-            static_cast< cppu::OWeakObject * >(this), 0);
+    try {
+        return provider_->find(aName) != 0;
+    } catch (unoidl::FileFormatException & e) {
+        throw css::uno::DeploymentException(
+            e.getUri() + ": " + e.getDetail(),
+            static_cast< cppu::OWeakObject * >(this));
     }
-    //TODO: remove requests are silently ignored for now
 }
 
 css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
-cppuhelper::TypeManager::createTypeDescriptionEnumeration(
+Provider::createTypeDescriptionEnumeration(
     rtl::OUString const & moduleName,
     css::uno::Sequence< css::uno::TypeClass > const & types,
     css::reflection::TypeDescriptionSearchDepth depth)
-    throw (
+    throw(
         css::reflection::NoSuchTypeNameException,
-        css::reflection::InvalidTypeNameException,
-        css::uno::RuntimeException)
+        css::reflection::InvalidTypeNameException, css::uno::RuntimeException)
 {
-    //TODO: This fails for modules spread across multiple providers, esp. for
-    // the empty moduleName
-    rtl::Reference< unoidl::Entity > ent(findEntity(moduleName));
-    if (!ent.is()) {
-        throw css::reflection::NoSuchTypeNameException(
-            moduleName, static_cast< cppu::OWeakObject * >(this));
-    }
-    if (ent->getSort() != unoidl::Entity::SORT_MODULE) {
-        throw css::reflection::InvalidTypeNameException(
-            moduleName, static_cast< cppu::OWeakObject * >(this));
-    }
-    rtl::Reference< unoidl::MapCursor > cursor;
     try {
-        cursor = static_cast< unoidl::ModuleEntity * >(ent.get())->
-            createCursor();
+        rtl::OUString prefix;
+        rtl::Reference< unoidl::MapCursor > cursor;
+        if (moduleName.isEmpty()) {
+            cursor = provider_->createRootCursor();
+        } else {
+            prefix = moduleName + ".";
+            bool cnst;
+            sal_uInt32 off = provider_->find(moduleName, &cnst);
+            if (off == 0) {
+                throw css::reflection::NoSuchTypeNameException(
+                    moduleName, static_cast< cppu::OWeakObject * >(this));
+            }
+            if (cnst) {
+                throw css::reflection::InvalidTypeNameException(
+                    moduleName, static_cast< cppu::OWeakObject * >(this));
+            }
+            rtl::Reference< unoidl::Entity > ent(provider_->getEntity(off));
+            if (ent->getSort() != unoidl::Entity::SORT_MODULE) {
+                throw css::reflection::InvalidTypeNameException(
+                    moduleName, static_cast< cppu::OWeakObject * >(this));
+            }
+            cursor = static_cast< unoidl::ModuleEntity * >(ent.get())->
+                createCursor();
+        }
+        return new Enumeration(
+            context_, prefix, cursor, types,
+            depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
     } catch (unoidl::FileFormatException & e) {
         throw css::uno::DeploymentException(
-            ("unoidl::FileFormatException for <" + e.getUri() + ">: "
-             + e.getDetail()),
+            e.getUri() + ": " + e.getDetail(),
             static_cast< cppu::OWeakObject * >(this));
     }
-    return new Enumeration(
-        this, moduleName + ".", cursor, types,
-        depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
 }
 
-void cppuhelper::TypeManager::readRdbs(rtl::OUString const & uris) {
-    for (sal_Int32 i = 0; i != -1;) {
-        rtl::OUString uri(uris.getToken(0, ' ', i));
-        if (uri.isEmpty()) {
-            continue;
-        }
-        bool optional;
-        bool directory;
-        cppu::decodeRdbUri(&uri, &optional, &directory);
-        if (directory) {
-            readRdbDirectory(uri, optional);
-        } else {
-            readRdbFile(uri, optional);
+css::uno::Reference< css::container::XHierarchicalNameAccess >
+readLegacyRdbFile(
+    rtl::OUString const & uri,
+    css::uno::Reference< css::lang::XMultiComponentFactory > const &
+        serviceManager,
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    assert(serviceManager.is());
+    css::uno::Reference< css::registry::XSimpleRegistry > reg(
+        serviceManager->createInstanceWithContext(
+            "com.sun.star.comp.stoc.SimpleRegistry", context),
+        css::uno::UNO_QUERY_THROW);
+    try {
+        reg->open(uri, true, false);
+    } catch (css::registry::InvalidRegistryException & e) {
+        throw css::uno::DeploymentException(
+            "Invalid registry " + uri + ":" + e.Message,
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    css::uno::Sequence< css::uno::Any > arg(1);
+    arg[0] <<= reg;
+    return css::uno::Reference< css::container::XHierarchicalNameAccess >(
+        serviceManager->createInstanceWithArgumentsAndContext(
+            "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider", arg,
+            context),
+        css::uno::UNO_QUERY_THROW);
+}
+
+void readRdbFile(
+    rtl::OUString const & uri, bool optional,
+    css::uno::Reference< css::lang::XMultiComponentFactory > const &
+        serviceManager,
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    std::vector<
+        css::uno::Reference< css::container::XHierarchicalNameAccess > > *
+            providers)
+{
+    assert(providers != 0);
+    css::uno::Reference< css::container::XHierarchicalNameAccess > prov;
+    try {
+        prov = new Provider(context, uri);
+    } catch (unoidl::NoSuchFileException &) {
+        if (optional) {
+            SAL_INFO("cppuhelper", "Ignored optional " << uri);
+            return;
         }
+        throw css::uno::DeploymentException(
+            uri + ": no such file",
+            css::uno::Reference< css::uno::XInterface >());
+    } catch (unoidl::FileFormatException &) {
+        prov = readLegacyRdbFile(uri, serviceManager, context);
     }
+    assert(prov.is());
+    providers->push_back(prov);
 }
 
-void cppuhelper::TypeManager::readRdbDirectory(
-    rtl::OUString const & uri, bool optional)
+void readRdbDirectory(
+    rtl::OUString const & uri, bool optional,
+    css::uno::Reference< css::lang::XMultiComponentFactory > const &
+        serviceManager,
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    std::vector<
+        css::uno::Reference< css::container::XHierarchicalNameAccess > > *
+            providers)
 {
     osl::Directory dir(uri);
     switch (dir.open()) {
@@ -2110,258 +2017,54 @@ void cppuhelper::TypeManager::readRdbDirectory(
     default:
         throw css::uno::DeploymentException(
             "Cannot open directory " + uri,
-            static_cast< cppu::OWeakObject * >(this));
+            css::uno::Reference< css::uno::XInterface >());
     }
     for (;;) {
-        rtl::OUString url;
-        if (!cppu::nextDirectoryItem(dir, &url)) {
+        rtl::OUString fileUri;
+        if (!cppu::nextDirectoryItem(dir, &fileUri)) {
             break;
         }
-        readRdbFile(url, false);
+        readRdbFile(fileUri, optional, serviceManager, context, providers);
     }
 }
 
-void cppuhelper::TypeManager::readRdbFile(
-    rtl::OUString const & uri, bool optional)
-{
-    rtl::Reference< unoidl::Provider > prov;
-    try {
-        prov = unoidl::loadProvider(manager_, uri);
-    } catch (unoidl::NoSuchFileException &) {
-        if (!optional) {
-            throw css::uno::DeploymentException(
-                uri + ": no such file",
-                static_cast< cppu::OWeakObject * >(this));
-        }
-        SAL_INFO("cppuhelper", "Ignored optional " << uri);
-    } catch (unoidl::FileFormatException & e) {
-            throw css::uno::DeploymentException(
-                ("unoidl::FileFormatException for <" + e.getUri() + ">: "
-                 + e.getDetail()),
-                static_cast< cppu::OWeakObject * >(this));
-    }
-    manager_->addProvider(prov);
 }
 
-css::uno::Any cppuhelper::TypeManager::getSequenceType(
-    rtl::OUString const & name)
-{
-    assert(name.match("[]"));
-    return css::uno::makeAny<
-        css::uno::Reference< css::reflection::XTypeDescription > >(
-            new SequenceTypeDescription(
-                this, name, name.copy(std::strlen("[]"))));
-}
-
-css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
-    rtl::OUString const & name, sal_Int32 separator)
-{
-    assert(name.indexOf('<') == separator && separator != -1);
-    rtl::Reference< unoidl::Entity > ent(findEntity(name.copy(0, separator)));
-    if (!ent.is()
-        || (ent->getSort()
-            != unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE))
-    {
-        return css::uno::Any();
-    }
-    rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > ent2(
-        static_cast< unoidl::PolymorphicStructTypeTemplateEntity * >(
-            ent.get()));
-    std::vector< rtl::OUString > args;
-    sal_Int32 i = separator;
-    do {
-        ++i; // skip '<' or ','
-        sal_Int32 j = i;
-        for (sal_Int32 level = 0; j != name.getLength(); ++j) {
-            sal_Unicode c = name[j];
-            if (c == ',') {
-                if (level == 0) {
-                    break;
-                }
-            } else if (c == '<') {
-                ++level;
-            } else if (c == '>') {
-                if (level == 0) {
-                    break;
-                }
-                --level;
-            }
+css::uno::Sequence<
+    css::uno::Reference< css::container::XHierarchicalNameAccess > >
+cppuhelper::createTypeDescriptionProviders(
+    rtl::OUString const & uris,
+    css::uno::Reference< css::lang::XMultiComponentFactory > const &
+        serviceManager,
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    std::vector<
+        css::uno::Reference< css::container::XHierarchicalNameAccess > > provs;
+    for (sal_Int32 i = 0; i != -1;) {
+        rtl::OUString uri(uris.getToken(0, ' ', i));
+        if (uri.isEmpty()) {
+            continue;
         }
-        if (j != name.getLength()) {
-            args.push_back(name.copy(i, j - i));
+        bool optional;
+        bool directory;
+        cppu::decodeRdbUri(&uri, &optional, &directory);
+        if (directory) {
+            readRdbDirectory(uri, optional, serviceManager, context, &provs);
+        } else {
+            readRdbFile(uri, optional, serviceManager, context, &provs);
         }
-        i = j;
-    } while (i != name.getLength() && name[i] != '>');
-    if (i != name.getLength() - 1 || name[i] != '>'
-        || args.size() != ent2->getTypeParameters().size())
-    {
-        return css::uno::Any();
     }
-    return css::uno::makeAny<
-        css::uno::Reference< css::reflection::XTypeDescription > >(
-            new InstantiatedPolymorphicStructTypeDescription(
-                this, name, ent2, args));
-}
-
-css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
-    rtl::OUString const & name, sal_Int32 separator)
-{
-    assert(name.indexOf("::") == separator && separator != -1);
-    css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc(
-        resolveTypedefs(find(name.copy(0, separator))), css::uno::UNO_QUERY);
-    if (!ifc.is()) {
-        return css::uno::Any();
-    }
-    rtl::OUString member(name.copy(separator + std::strlen("::")));
     css::uno::Sequence<
+        css::uno::Reference< css::container::XHierarchicalNameAccess > > provs2(
+            static_cast< sal_Int32 >(provs.size())); //TODO: check overflow
+    std::vector<
         css::uno::Reference<
-            css::reflection::XInterfaceMemberTypeDescription > > mems(
-                ifc->getMembers());
-    for (sal_Int32 i = 0; i != mems.getLength(); ++i) {
-        if (mems[i]->getMemberName() == member) {
-            return css::uno::makeAny<
-                css::uno::Reference< css::reflection::XTypeDescription > >(
-                    mems[i].get());
-        }
-    }
-    return css::uno::Any();
-}
-
-css::uno::Any cppuhelper::TypeManager::getNamed(
-    rtl::OUString const & name, rtl::Reference< unoidl::Entity > entity)
-{
-    assert(entity.is());
-    switch (entity->getSort()) {
-    case unoidl::Entity::SORT_MODULE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new ModuleDescription(
-                    this, name,
-                    static_cast< unoidl::ModuleEntity * >(entity.get())));
-    case unoidl::Entity::SORT_ENUM_TYPE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new EnumTypeDescription(
-                    name,
-                    static_cast< unoidl::EnumTypeEntity * >(entity.get())));
-    case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new PlainStructTypeDescription(
-                    this, name,
-                    static_cast< unoidl::PlainStructTypeEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new PolymorphicStructTypeTemplateDescription(
-                    this, name,
-                    static_cast<
-                        unoidl::PolymorphicStructTypeTemplateEntity * >(
-                            entity.get())));
-    case unoidl::Entity::SORT_EXCEPTION_TYPE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new ExceptionTypeDescription(
-                    this, name,
-                    static_cast< unoidl::ExceptionTypeEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_INTERFACE_TYPE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new InterfaceTypeDescription(
-                    this, name,
-                    static_cast< unoidl::InterfaceTypeEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_TYPEDEF:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new TypedefDescription(
-                    this, name,
-                    static_cast< unoidl::TypedefEntity * >(entity.get())));
-    case unoidl::Entity::SORT_CONSTANT_GROUP:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new ConstantGroupDescription(
-                    name,
-                    static_cast< unoidl::ConstantGroupEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new SingleInterfaceBasedServiceDescription(
-                    this, name,
-                    static_cast< unoidl::SingleInterfaceBasedServiceEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new AccumulationBasedServiceDescription(
-                    this, name,
-                    static_cast< unoidl::AccumulationBasedServiceEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new InterfaceBasedSingletonDescription(
-                    this, name,
-                    static_cast< unoidl::InterfaceBasedSingletonEntity * >(
-                        entity.get())));
-    case unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
-        return css::uno::makeAny<
-            css::uno::Reference< css::reflection::XTypeDescription > >(
-                new ServiceBasedSingletonDescription(
-                    this, name,
-                    static_cast< unoidl::ServiceBasedSingletonEntity * >(
-                        entity.get())));
-    default:
-        for (;;) { std::abort(); } // this cannot happen
-    }
-}
-
-css::uno::Any cppuhelper::TypeManager::getEnumMember(
-    rtl::Reference< unoidl::EnumTypeEntity > entity,
-    rtl::OUString const & member)
-{
-    for (std::vector< unoidl::EnumTypeEntity::Member >::const_iterator i(
-             entity->getMembers().begin());
-         i != entity->getMembers().end(); ++i)
-    {
-        if (i->name == member) {
-            return css::uno::makeAny(i->value);
-        }
-    }
-    return css::uno::Any();
-}
-
-css::uno::Any cppuhelper::TypeManager::getConstant(
-    rtl::Reference< unoidl::ConstantGroupEntity > entity,
-    rtl::OUString const & member)
-{
-    for (std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator i(
-             entity->getMembers().begin());
-         i != entity->getMembers().end(); ++i)
-    {
-        if (i->name == member) {
-            return css::uno::makeAny<
-                css::uno::Reference< css::reflection::XTypeDescription > >(
-                    new ConstantDescription(*i));
-        }
-    }
-    return css::uno::Any();
-}
-
-rtl::Reference< unoidl::Entity > cppuhelper::TypeManager::findEntity(
-    rtl::OUString const & name)
-{
-    try {
-        return manager_->findEntity(name);
-    } catch (unoidl::FileFormatException & e) {
-        throw css::uno::DeploymentException(
-            ("unoidl::FileFormatException for <" + e.getUri() + ">: "
-             + e.getDetail()),
-            static_cast< cppu::OWeakObject * >(this));
+            css::container::XHierarchicalNameAccess > >::iterator i(
+                provs.begin());
+    for (sal_Int32 j = 0; j != provs2.getLength(); ++j) {
+        provs2[j] = *i++;
     }
+    return provs2;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/typedescriptionprovider.hxx b/cppuhelper/source/typedescriptionprovider.hxx
new file mode 100644
index 000000000000..93336e8982f6
--- /dev/null
+++ b/cppuhelper/source/typedescriptionprovider.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CPPUHELPER_SOURCE_TYPEDESCRIPTIONPROVIDER_HXX
+#define INCLUDED_CPPUHELPER_SOURCE_TYPEDESCRIPTIONPROVIDER_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+
+namespace com { namespace sun { namespace star {
+     namespace container { class XHierarchicalNameAccess; }
+     namespace lang { class XMultiComponentFactory; }
+     namespace uno { class XComponentContext; }
+} } }
+namespace rtl { class OUString; }
+
+namespace cppuhelper {
+
+css::uno::Sequence<
+    css::uno::Reference< css::container::XHierarchicalNameAccess > >
+createTypeDescriptionProviders(
+    rtl::OUString const & uris,
+    css::uno::Reference< css::lang::XMultiComponentFactory > const &
+        serviceManager,
+    css::uno::Reference< css::uno::XComponentContext > const & context);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
deleted file mode 100644
index a84a2319f3a0..000000000000
--- a/cppuhelper/source/typemanager.hxx
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_CPPUHELPER_SOURCE_TYPEMANAGER_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_TYPEMANAGER_HXX
-
-#include "sal/config.h"
-
-#include "com/sun/star/container/ElementExistException.hpp"
-#include "com/sun/star/container/NoSuchElementException.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/container/XSet.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/reflection/InvalidTypeNameException.hpp"
-#include "com/sun/star/reflection/NoSuchTypeNameException.hpp"
-#include "com/sun/star/reflection/TypeDescriptionSearchDepth.hpp"
-#include "com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/compbase4.hxx"
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "sal/types.h"
-
-namespace com { namespace sun { namespace star {
-    namespace uno { class Any; }
-    namespace reflection { class XTypeDescription; }
-} } }
-namespace rtl { class OUString; }
-namespace unoidl {
-    class ConstantGroupEntity;
-    class Entity;
-    class EnumTypeEntity;
-    class Manager;
-}
-
-namespace cppuhelper {
-
-typedef cppu::WeakComponentImplHelper4<
-    css::lang::XServiceInfo, css::container::XHierarchicalNameAccess,
-    css::container::XSet, css::reflection::XTypeDescriptionEnumerationAccess >
-TypeManager_Base;
-
-class TypeManager: private osl::Mutex, public TypeManager_Base {
-public:
-    explicit TypeManager(rtl::OUString const & rdbUris);
-
-    using TypeManager_Base::acquire;
-    using TypeManager_Base::release;
-
-    css::uno::Any find(rtl::OUString const & name);
-
-    css::uno::Reference< css::reflection::XTypeDescription > resolve(
-        rtl::OUString const & name);
-
-private:
-    virtual ~TypeManager() throw ();
-
-    virtual void SAL_CALL disposing();
-
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
-        throw (css::uno::RuntimeException);
-
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException);
-
-    virtual css::uno::Any SAL_CALL getByHierarchicalName(
-        rtl::OUString const & aName)
-        throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
-        throw (css::uno::RuntimeException);
-
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
-
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-    createEnumeration() throw (css::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
-        throw (css::uno::RuntimeException);
-
-    virtual void SAL_CALL insert(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, css::uno::RuntimeException);
-
-    virtual void SAL_CALL remove(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, css::uno::RuntimeException);
-
-    virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
-    SAL_CALL createTypeDescriptionEnumeration(
-        rtl::OUString const & moduleName,
-        css::uno::Sequence< css::uno::TypeClass > const & types,
-        css::reflection::TypeDescriptionSearchDepth depth)
-        throw (
-            css::reflection::NoSuchTypeNameException,
-            css::reflection::InvalidTypeNameException,
-            css::uno::RuntimeException);
-
-    void readRdbs(rtl::OUString const & uris);
-
-    void readRdbDirectory(rtl::OUString const & uri, bool optional);
-
-    void readRdbFile(rtl::OUString const & uri, bool optional);
-
-    css::uno::Any getSequenceType(rtl::OUString const & name);
-
-    css::uno::Any getInstantiatedStruct(
-        rtl::OUString const & name, sal_Int32 separator);
-
-    css::uno::Any getInterfaceMember(
-        rtl::OUString const & name, sal_Int32 separator);
-
-    css::uno::Any getNamed(
-        rtl::OUString const & name, rtl::Reference< unoidl::Entity > entity);
-
-    css::uno::Any getEnumMember(
-        rtl::Reference< unoidl::EnumTypeEntity > entity,
-        rtl::OUString const & member);
-
-    css::uno::Any getConstant(
-        rtl::Reference< unoidl::ConstantGroupEntity > entity,
-        rtl::OUString const & member);
-
-    rtl::Reference< unoidl::Entity > findEntity(rtl::OUString const & name);
-
-    rtl::Reference< unoidl::Manager > manager_;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */