Author: atsushi
Date: 2005-03-07 15:53:33 -0500 (Mon, 07 Mar 2005)
New Revision: 41538

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

        * XslLiteralElement.cs : literal attributes should also consider
          namespace aliases.



Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog        
2005-03-07 20:29:21 UTC (rev 41537)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog        
2005-03-07 20:53:33 UTC (rev 41538)
@@ -1,5 +1,10 @@
 2005-03-07  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
+       * XslLiteralElement.cs : literal attributes should also consider
+         namespace aliases.
+
+2005-03-07  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
        * XslAttribute.cs,
          XslLiteralElement.cs :
          Now namespace aliases are collected in prior to template

Modified: 
trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs     
2005-03-07 20:29:21 UTC (rev 41537)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs     
2005-03-07 20:53:33 UTC (rev 41538)
@@ -54,7 +54,20 @@
                        public XslLiteralAttribute (Compiler c)
                        {
                                this.prefix = c.Input.Prefix;
-                               this.nsUri = c.Input.NamespaceURI;
+                               if (prefix.Length > 0) {
+                                       string alias = 
+                                               
c.CurrentStylesheet.GetActualPrefix (prefix);
+                                       if (alias != prefix) {
+                                               prefix = alias;
+                                               XPathNavigator clone = 
c.Input.Clone ();
+                                               clone.MoveToParent ();
+                                               nsUri = clone.GetNamespace 
(alias);
+                                       }
+                                       else
+                                               nsUri = c.Input.NamespaceURI;
+                               }
+                               else
+                                       nsUri = String.Empty;
                                this.localname = c.Input.LocalName;
                                this.val = new XslAvt (c.Input.Value, c);
                        }

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

Reply via email to