[Libreoffice-commits] .: cli_ure/source

[Libreoffice Gerrit user]

 cli_ure/source/climaker/climaker_emit.cxx |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit b6e1a001df60cc3f606d3f7fc361367feb13edaf
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Aug 20 19:13:48 2012 -0400

    fix StackOverflowException in climaker
    
    Change-Id: I640eddb4496d295d3cea9f45875b415d419060f4
    Reviewed-on: https://gerrit.libreoffice.org/448
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index db1e6ab..8c3768e 100755
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -277,15 +277,12 @@ Assembly ^ TypeEmitter::type_resolve(
     ::System::Object ^, ::System::ResolveEventArgs ^ args )
 {
     ::System::String ^ cts_name = args->Name;
-    ::System::Type ^ ret_type = m_module_builder->GetType(
-        cts_name, false /* no exc */ );
-    if (nullptr == ret_type)
-    {
-        iface_entry ^ entry = dynamic_cast< iface_entry ^ >(
-            m_incomplete_ifaces[cts_name] );
-        if (nullptr != entry)
-            ret_type = entry->m_type_builder;
-    }
+    ::System::Type ^ ret_type;
+
+    iface_entry ^ entry = dynamic_cast< iface_entry ^ >(m_incomplete_ifaces[cts_name] );
+    if (nullptr != entry)
+        ret_type = entry->m_type_builder;
+
     if (nullptr == ret_type)
     {
         sal_Int32 len = m_extra_assemblies->Length;