[API CHANGE] WIP: Experimental new binary type.rdb format

Make javamaker work on top of unoidl/ instead of registry/.

API CHANGE: javamaker no longer supports the -B switch, as that is meaningless
with the new format.  When reading from an old-format .rdb file, /UCR is hard-
coded as the prefix now.

Change-Id: I8cca39f8ebacd0476934f7bd493d206928d063a9

2 files changed, 13 insertions, 6 deletions

diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx
index 26c87e123fdb..8ff0a9a02d17 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/codemaker/inc/codemaker/commonjava.hxx
@@ -25,8 +25,8 @@
 namespace codemaker { namespace java {
 
 rtl::OString translateUnoToJavaType(
-    codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, bool referenceType);
+    codemaker::UnoType::Sort sort, rtl::OString const & nucleus,
+    bool referenceType);
 
 rtl::OString translateUnoToJavaIdentifier(
     rtl::OString const & identifier, rtl::OString const & prefix);
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index 325a51011756..0d3769319982 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -79,15 +79,22 @@ public:
     sal_Int32 getSize() const { return m_t2TypeClass.size(); }
 
 
-    void loadProvider(rtl::OUString const & uri, bool primary);
+    void loadProvider(OUString const & uri, bool primary);
 
-    bool foundAtPrimaryProvider(rtl::OUString const & name) const;
+    bool foundAtPrimaryProvider(OUString const & name) const;
 
     codemaker::UnoType::Sort getSort(
-        rtl::OUString const & name,
-        rtl::Reference< unoidl::Entity > * entity = 0,
+        OUString const & name, rtl::Reference< unoidl::Entity > * entity = 0,
         rtl::Reference< unoidl::MapCursor > * cursor = 0) const;
 
+    codemaker::UnoType::Sort getSortResolveOuterSequences(
+        OUString const & name, OUString * nucleus, sal_Int32 * rank) const;
+
+    codemaker::UnoType::Sort getSortResolveAllSequencesTemplatesTypedefs(
+        OUString const & name, OUString * nucleus, sal_Int32 * rank,
+        std::vector< OUString > * arguments,
+        rtl::Reference< unoidl::Entity > * entity) const;
+
 private:
     virtual ~TypeManager();