Commit 307fa23

authored

Use XmlDOMTextWriter instead of XmlWriter.Create (#1961)

Closes #1869

1 parent a073d05 commit 307fa23Copy full SHA for 307fa23

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public void Save(Stream stream)`
`216`	`216`	`var events = Features.Get<IPartRootEventsFeature>();`
`217`	`217`	`events?.OnChange(EventType.Saving, OpenXmlPart);`
`218`	`218`
`219`		`- using (var xmlWriter = XmlWriter.Create(stream, settings))`
	`219`	`+ using (var xmlWriter = newXmlDOMTextWriter(stream, settings))`
`220`	`220`	`{`
`221`	`221`	`if (_standaloneDeclaration is not null)`
`222`	`222`	`{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ private static void AddXmlPackagePart(XElement flatOpcPart, IPackage package)`
`206`	`206`	`var part = CreatePackagePart(flatOpcPart, package);`
`207`	`207`
`208`	`208`	`using var stream = part.GetStream(FileMode.Create);`
`209`		`- using var xmlWriter = XmlWriter.Create(stream);`
	`209`	`+ using var xmlWriter = newXmlDOMTextWriter(stream);`
`210`	`210`
`211`	`211`	`XElement rootElement = flatOpcPart.Elements(Pkg + "xmlData").Elements().First();`
`212`	`212`	`rootElement.WriteTo(xmlWriter);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Runtime.CompilerServices;`
`7`	`7`
`8`	`8`	`[assembly: InternalsVisibleTo("DocumentFormat.OpenXml, Publickey=002400000480000094000000060200000024000052534131000400000100010061d8931836c82bf25ca6b773dfd6e7b3ab4e43fba60cf4a86347170373415a165ccc40da3da4a52163822db9fa91f15828236d32d6a9fe754859f10d1f8262646c1f3fb6b4348123f14d733db0ff11c3198b7cf56caaebbf14563990446a6c32aff36d5a7097194294c127fe3cdf9f2609daae5f4daf26f8b6227f203d2a8bbf")]`
	`9`	`+[assembly: InternalsVisibleTo("DocumentFormat.OpenXml.Linq, Publickey=002400000480000094000000060200000024000052534131000400000100010061d8931836c82bf25ca6b773dfd6e7b3ab4e43fba60cf4a86347170373415a165ccc40da3da4a52163822db9fa91f15828236d32d6a9fe754859f10d1f8262646c1f3fb6b4348123f14d733db0ff11c3198b7cf56caaebbf14563990446a6c32aff36d5a7097194294c127fe3cdf9f2609daae5f4daf26f8b6227f203d2a8bbf")]`
`9`	`10`
`10`	`11`	`// For testing`
`11`	`12`	`[assembly: InternalsVisibleTo("DocumentFormat.OpenXml.Tests, Publickey=002400000480000094000000060200000024000052534131000400000100010061d8931836c82bf25ca6b773dfd6e7b3ab4e43fba60cf4a86347170373415a165ccc40da3da4a52163822db9fa91f15828236d32d6a9fe754859f10d1f8262646c1f3fb6b4348123f14d733db0ff11c3198b7cf56caaebbf14563990446a6c32aff36d5a7097194294c127fe3cdf9f2609daae5f4daf26f8b6227f203d2a8bbf")]`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,16 @@ internal class XmlDOMTextWriter : XmlWriter`
`11`	`11`	`{`
`12`	`12`	`private readonly XmlWriter _writer;`
`13`	`13`
	`14`	`+ public XmlDOMTextWriter(Stream stream)`
	`15`	`+ {`
	`16`	`+ _writer = Create(stream);`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ public XmlDOMTextWriter(Stream stream, XmlWriterSettings settings)`
	`20`	`+ {`
	`21`	`+ _writer = Create(stream, settings);`
	`22`	`+ }`
	`23`	`+`
`14`	`24`	`public XmlDOMTextWriter(TextWriter w)`
`15`	`25`	`{`
`16`	`26`	`var xwSettings = new XmlWriterSettings`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public bool Save()`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`using (var stream = _part.GetStream(FileMode.Create, FileAccess.Write))`
`141`		`- using (var xmlWriter = XmlWriter.Create(stream))`
	`141`	`+ using (var xmlWriter = newXmlDOMTextWriter(stream))`
`142`	`142`	`{`
`143`	`143`	`_partXDocument.Save(xmlWriter);`
`144`	`144`	`}`

Comments

(0)