Author: miguel
Date: 2006-03-12 16:04:08 -0500 (Sun, 12 Mar 2006)
New Revision: 57882

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/compat_2_0.resx
Log:
Patch from Robert Jordan for bug 77253, 2006-01-14  Robert Jordan  <[EMAIL 
PROTECTED]>

        * ResXResourceReader.cs: Fix for bug #77253. Thanks to Marek Habersack
        ([EMAIL PROTECTED]).

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog    
2006-03-12 20:58:43 UTC (rev 57881)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog    
2006-03-12 21:04:08 UTC (rev 57882)
@@ -1,3 +1,8 @@
+2006-01-14  Robert Jordan  <[EMAIL PROTECTED]>
+
+       * ResXResourceReader.cs: Fix for bug #77253. Thanks to Marek Habersack
+       ([EMAIL PROTECTED]).
+
 2005-12-05  Peter Bartok  <[EMAIL PROTECTED]>
 
        * ResXResourceReader.cs: Removed previous patch. More than just Byte[]

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs    
    2006-03-12 20:58:43 UTC (rev 57881)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs    
    2006-03-12 21:04:08 UTC (rev 57882)
@@ -119,13 +119,24 @@
                        return null;
                }
 
-               static string get_value (XmlTextReader reader, string name) {
+
+               static string get_value (XmlTextReader reader, string name)
+               {
+                       return get_value (reader, name, true);
+               }
+
+               // Returns the value of the next XML element with the specified
+               // name from the reader. canBeCdata == true specifies that
+               // the element may be a CDATA node as well.
+               static string get_value (XmlTextReader reader, string name, 
bool canBeCdata) {
                        bool gotelement = false;
                        while (reader.Read ()) {
                                if (reader.NodeType == XmlNodeType.Element && 
String.Compare (reader.Name, name, true) == 0) {
                                        gotelement = true;
                                        break;
                                }
+                               if (canBeCdata && reader.NodeType == 
XmlNodeType.CDATA)
+                                  return reader.Value;
                        }
                        if (!gotelement)
                                return null;

Modified: trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog       
2006-03-12 20:58:43 UTC (rev 57881)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog       
2006-03-12 21:04:08 UTC (rev 57882)
@@ -1,3 +1,7 @@
+2006-01-14  Robert Jordan  <[EMAIL PROTECTED]>
+
+       * compat_2_0.resx: Added a CDATA element as a test for bug #77253.
+
 2005-12-01  Robert Jordan  <[EMAIL PROTECTED]>
 
        * CompatTest.cs, compat*.resx: Compatibility unit tests.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/compat_2_0.resx
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/compat_2_0.resx 
2006-03-12 20:58:43 UTC (rev 57881)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/compat_2_0.resx 
2006-03-12 21:04:08 UTC (rev 57882)
@@ -67,9 +67,7 @@
   <data name="String" xml:space="preserve">
     <value>hola</value>
   </data>
-  <data name="String2" xml:space="preserve">
-    <value>hello</value>
-  </data>
+  <data name="String2" xml:space="preserve"><![CDATA[hello]]></data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" />
   <data name="Int" type="System.Int32, mscorlib">
     <value>42</value>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to