From 0557453a35863310f34e6c10facbac63bc89837d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 12 Apr 2013 15:21:37 +0200
Subject: Combine getSortResolve...() into one decompose()

Change-Id: Ie1c1311d1df14d5639b7642d2b9a1588605c31fc
---
 codemaker/source/javamaker/javatype.cxx | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'codemaker/source/javamaker')

diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 3766b71a4171..3bd6ef4cc6d9 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -74,8 +74,7 @@ void appendUnoName(
             OUString n;
             sal_Int32 k;
             std::vector< OUString > args;
-            manager->getSortResolveAllSequencesTemplatesTypedefs(
-                *i, &n, &k, &args, 0);
+            manager->decompose(*i, false, &n, &k, &args, 0);
             appendUnoName(manager, n, k, args, buffer);
         }
         buffer->append('>');
@@ -284,9 +283,8 @@ SpecialType translateUnoTypeToDescriptor(
     OUString nucleus;
     sal_Int32 rank;
     std::vector< OUString > args;
-    codemaker::UnoType::Sort sort = manager->
-        getSortResolveAllSequencesTemplatesTypedefs(
-            type, &nucleus, &rank, &args, 0);
+    codemaker::UnoType::Sort sort = manager->decompose(
+        type, true, &nucleus, &rank, &args, 0);
     return translateUnoTypeToDescriptor(
         manager, sort, nucleus, rank, args, array, classType, dependencies,
         descriptor, signature, needsSignature, polymorphicUnoType);
@@ -897,9 +895,8 @@ sal_uInt16 addFieldInit(
     sal_Int32 rank;
     std::vector< rtl::OUString > args;
     rtl::Reference< unoidl::Entity > ent;
-    codemaker::UnoType::Sort sort
-        = manager->getSortResolveAllSequencesTemplatesTypedefs(
-            fieldType, &nucleus, &rank, &args, &ent);
+    codemaker::UnoType::Sort sort = manager->decompose(
+        fieldType, true, &nucleus, &rank, &args, &ent);
     if (rank == 0) {
         switch (sort) {
         case codemaker::UnoType::SORT_BOOLEAN:
@@ -1023,9 +1020,8 @@ sal_uInt16 addLoadLocal(
         OUString nucleus;
         sal_Int32 rank;
         std::vector< OUString > args;
-        codemaker::UnoType::Sort sort = manager->
-            getSortResolveAllSequencesTemplatesTypedefs(
-                type, &nucleus, &rank, &args, 0);
+        codemaker::UnoType::Sort sort = manager->decompose(
+            type, true, &nucleus, &rank, &args, 0);
         if (rank == 0) {
             switch (sort) {
             case codemaker::UnoType::SORT_BOOLEAN:
@@ -1928,9 +1924,7 @@ void handleTypedef(
     assert(manager.is());
     assert(dependencies != 0);
     OUString nucleus;
-    sal_Int32 rank;
-    switch (manager->getSortResolveOuterSequences(
-                entity->getType(), &nucleus, &rank))
+    switch (manager->decompose(entity->getType(), false, &nucleus, 0, 0, 0))
     {
     case codemaker::UnoType::SORT_BOOLEAN:
     case codemaker::UnoType::SORT_BYTE:
-- 
cgit