[ooo-build-commit] .: patches/mono

[Noel Power]

 patches/mono/mono-climaker.diff |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 07a99e5135389b67fb4a4c424acb02bb9285cec2
Author: Noel Power <noel.power at novell.com>
Date:   Wed Sep 8 10:17:13 2010 +0100

    fix master mono breakage,  core in unoil ( e.g. cli_oootypes.dll generation  )

diff --git a/patches/mono/mono-climaker.diff b/patches/mono/mono-climaker.diff
index 4110d40..3547c90 100644
--- a/patches/mono/mono-climaker.diff
+++ b/patches/mono/mono-climaker.diff
@@ -32,7 +32,7 @@ new file mode 100644
 index 0000000..d3b3711
 --- /dev/null
 +++ cli_ure/source/climaker/climaker_csharp.cs
-@@ -0,0 +1,3200 @@
+@@ -0,0 +1,3202 @@
 +using System;
 +using System.Collections;
 +using System.Reflection;
@@ -917,9 +917,11 @@ index 0000000..d3b3711
 +            ret = typeBuilder.CreateType ();
 +        }
 +
-+        // In case of an instantiated polymorphic struct we want to return a
-+        // uno.PolymorphicType (inherits Type) rather then Type.
-+        if (xsd != null && xsd.TypeArguments > 0) {
++        // This is neaded 
++        // for constructing the service code. We can only do that if the 
++        // struct is completed. 
++        StructEntry anEntry = mGeneratedStructs [name] as StructEntry;
++        if ( anEntry != null && xsd != null && xsd.TypeArguments > 0) {
 +            //Console.WriteLine ("polymorphic struct: call uno.PolymorphicType.GetType ({0}, {1})", ret, xtd.Name);
 +            ret = uno.PolymorphicType.GetType (ret, MapUnoTypeName (xtd.Name));
 +            //Console.WriteLine ("polymorphic struct: {0} ({1})", ret, xtd.Name);