Quellcode durchsuchen

2004-11-26 Atsushi Enomoto <[email protected]>

	* XPathNavigatorReader.cs,
	  KeyPattern.cs : warning removal



svn path=/trunk/mcs/; revision=36591
Atsushi Eno vor 21 Jahren
Ursprung
Commit
2022c818f4

+ 5 - 0
mcs/class/System.XML/Mono.Xml.XPath/ChangeLog

@@ -1,3 +1,8 @@
+2004-11-26  Atsushi Enomoto <[email protected]>
+
+	* XPathNavigatorReader.cs,
+	  KeyPattern.cs : warning removal
+
 2004-11-19  Atsushi Enomoto <[email protected]>
 
 	* XPathNavigatorReader.cs : changed to be compatible with that is

+ 0 - 9
mcs/class/System.XML/Mono.Xml.XPath/KeyPattern.cs

@@ -41,25 +41,16 @@ namespace Mono.Xml.XPath
 {
 	internal class KeyPattern : LocationPathPattern 
 	{
-		XmlQualifiedName keyName;
-		string arg0, arg1;
 		XsltKey key;
 		
 		public KeyPattern (XsltKey key)
 			: base ((NodeTest) null)
 		{
 			this.key = key;
-			ExprLiteral keyName = key.KeyName as ExprLiteral;
-			ExprLiteral field = key.Field as ExprLiteral;
-			this.arg0 = keyName.Value;
-			this.arg1 = field.Value;
-			this.keyName = XslNameUtil.FromString (arg0, key.NamespaceManager);
 		}
 		
 		public override bool Matches (XPathNavigator node, XsltContext ctx)
 		{
-			XsltCompiledContext xctx = ctx as XsltCompiledContext;
-			XslKey xslkey = xctx.Processor.CompiledStyle.Keys [keyName] as XslKey;
 			XPathNodeIterator iter = key.EvaluateNodeSet (new SelfIterator (node, ctx));
 			while (iter.MoveNext ())
 				if (iter.Current.IsSamePosition (node))

+ 2 - 0
mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs

@@ -59,7 +59,9 @@ namespace Mono.Xml.XPath
 		bool endElement;
 		bool attributeValueConsumed;
 		StringBuilder readStringBuffer = new StringBuilder ();
+#if NET_2_0
 		StringBuilder innerXmlBuilder = new StringBuilder ();
+#endif
 
 		int depth = 0;
 		int attributeCount = 0;