Author: atsushi
Date: 2005-03-08 01:08:59 -0500 (Tue, 08 Mar 2005)
New Revision: 41547

Modified:
   trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
   trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslAttribute.cs
Log:
2005-03-08  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * XslAttribute.cs : In Evaluate(), name strings are not computed as
          expected especially when they are bound to non-empty namespace.



Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog        
2005-03-08 06:06:59 UTC (rev 41546)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog        
2005-03-08 06:08:59 UTC (rev 41547)
@@ -1,3 +1,8 @@
+2005-03-08  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XslAttribute.cs : In Evaluate(), name strings are not computed as
+         expected especially when they are bound to non-empty namespace.
+
 2005-03-07  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * XslLiteralElement.cs : literal attributes should also consider

Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslAttribute.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslAttribute.cs  
2005-03-08 06:06:59 UTC (rev 41546)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslAttribute.cs  
2005-03-08 06:08:59 UTC (rev 41547)
@@ -113,11 +113,15 @@
                                nm = nm.Substring (colonAt + 1, nm.Length - 
colonAt - 1);
 
                                // global attribute
-                               if (nmsp == null) {
-                                       QName q = XslNameUtil.FromString (nm, 
nsDecls);
-                                       nm = q.Name;
-                                       nmsp = q.Namespace;
-                               } else
+                               if (nmsp == String.Empty &&
+                                       prefix == XmlNamespaceManager.PrefixXml)
+                                       nmsp = XmlNamespaceManager.XmlnsXml;
+                               else if (nmsp == String.Empty) {
+                                       nmsp = (string) nsDecls [prefix];
+                                       if (nmsp == null)
+                                               nmsp = String.Empty;
+                               }
+                               else
                                        nm = XslNameUtil.LocalNameOf (nm);
                        }
 

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

Reply via email to