[mvp-xml-cvs] XInclude/v1/src XIncludingReader.cs,1.12,1.13

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/XInclude/v1/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18482/v1/src

Modified Files:
	XIncludingReader.cs 
Log Message:
Working on OuterXml.

Index: XIncludingReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- XIncludingReader.cs	19 Oct 2004 16:24:55 -0000	1.12
+++ XIncludingReader.cs	20 Oct 2004 19:28:12 -0000	1.13
@@ -596,7 +596,13 @@
                 case XIncludingReaderState.ExposingXmlLangAttrValue:                    
                     return String.Empty;
                 default:                                            
-                    return _reader.ReadInnerXml();			    
+                    StringWriter sw = new StringWriter();
+                    XmlTextWriter xw = new XmlTextWriter(sw);
+                    int depth = Depth;
+                    while (Read() && Depth != depth)
+                        xw.WriteNode(this, false);
+                    xw.Close();
+                    return sw.ToString();                
             }            
         }
 
@@ -613,8 +619,12 @@
                     return @"xml:lang="" + _reader.XmlLang + @"""; 
                 case XIncludingReaderState.ExposingXmlLangAttrValue:                    
                     return String.Empty;
-                default:                                            
-                    return _reader.ReadOuterXml(); 
+                default:                                
+                    StringWriter sw = new StringWriter();
+                    XmlTextWriter xw = new XmlTextWriter(sw);
+                    xw.WriteNode(this, false);
+                    xw.Close();
+                    return sw.ToString();                    
             }
         }