diff --git a/OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs b/OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs index c906b59bb..c1aa4bf53 100644 --- a/OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs +++ b/OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs @@ -61,16 +61,15 @@ public CT_Border() } public override string ToString() { - MemoryStream ms = new MemoryStream(); - StreamWriter sw = new StreamWriter(ms); + using MemoryStream ms = new MemoryStream(); + using StreamWriter sw = new StreamWriter(ms); this.Write(sw, "border"); sw.Flush(); ms.Position = 0; - using (StreamReader sr = new StreamReader(ms)) - { - return sr.ReadToEnd(); - } + using StreamReader sr = new StreamReader(ms); + return sr.ReadToEnd(); } + public static CT_Border Parse(XmlNode node, XmlNamespaceManager namespaceManager) { if (node == null) diff --git a/OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs b/OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs index 08c625cd3..b2bc1c0c5 100644 --- a/OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs +++ b/OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs @@ -75,6 +75,17 @@ internal void Write(StreamWriter sw, string nodeName) sw.Write(string.Format("", nodeName)); } + public override string ToString() + { + using MemoryStream ms = new MemoryStream(); + using StreamWriter sw = new StreamWriter(ms); + Write(sw, "colors"); + sw.Flush(); + ms.Position = 0; + using StreamReader sr = new StreamReader(ms); + return sr.ReadToEnd(); + } + public bool IsSetIndexedColors() { return this.indexedColors != null; @@ -335,18 +346,6 @@ public bool IsSetTint() } #endregion tint - //internal static XmlSerializer serializer = new XmlSerializer(typeof(CT_Color)); - //internal static XmlSerializerNamespaces namespaces = new XmlSerializerNamespaces(new XmlQualifiedName[] { - // new XmlQualifiedName("", "http://schemas.openxmlformats.org/spreadsheetml/2006/main") }); - //public override string ToString() - //{ - // using (StringWriter stringWriter = new StringWriter()) - // { - // serializer.Serialize(stringWriter, this, namespaces); - // return stringWriter.ToString(); - // } - //} - public static CT_Color Parse(XmlNode node, XmlNamespaceManager namespaceManager) { if (node == null) @@ -365,9 +364,6 @@ public static CT_Color Parse(XmlNode node, XmlNamespaceManager namespaceManager) return ctObj; } - - - internal void Write(StreamWriter sw, string nodeName) { sw.Write(string.Format("<{0}", nodeName)); @@ -383,6 +379,17 @@ internal void Write(StreamWriter sw, string nodeName) sw.Write("/>"); } + public override string ToString() + { + using MemoryStream ms = new MemoryStream(); + using StreamWriter sw = new StreamWriter(ms); + Write(sw, "color"); + sw.Flush(); + ms.Position = 0; + using StreamReader sr = new StreamReader(ms); + return sr.ReadToEnd(); + } + public CT_Color Copy() { var res = new CT_Color(); diff --git a/OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs b/OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs index f8006b2af..f981a49ff 100644 --- a/OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs +++ b/OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs @@ -183,15 +183,6 @@ internal void Write(StreamWriter sw, string nodeName) sw.Write(string.Format("", nodeName)); } - - //public static string GetString(CT_Font font) - //{ - // using (StringWriter writer = new StringWriter()) - // { - // serializer.Serialize(writer, font, namespaces); - // return writer.ToString(); - // } - //} #region name [XmlElement] public CT_FontName name diff --git a/OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs b/OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs index 3ae3e75cf..f878ba8d0 100644 --- a/OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs +++ b/OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs @@ -150,12 +150,13 @@ internal void Write(StreamWriter sw, string nodeName, bool writingCellStyle=fals public override string ToString() { - XmlSerializer serializer = new XmlSerializer(typeof(CT_Xf)); - using (StringWriter stream = new StringWriter()) - { - serializer.Serialize(stream, this); - return stream.ToString(); - } + using MemoryStream ms = new MemoryStream(); + using StreamWriter sw = new StreamWriter(ms); + Write(sw, "xf", true); + sw.Flush(); + ms.Position = 0; + using StreamReader sr = new StreamReader(ms); + return sr.ReadToEnd(); } public bool IsSetFontId() diff --git a/ooxml/XSSF/UserModel/XSSFClientAnchor.cs b/ooxml/XSSF/UserModel/XSSFClientAnchor.cs index d38816fed..f98d419e5 100644 --- a/ooxml/XSSF/UserModel/XSSFClientAnchor.cs +++ b/ooxml/XSSF/UserModel/XSSFClientAnchor.cs @@ -273,7 +273,7 @@ internal CT_Marker From * @return ending anchor point */ - internal CT_Marker To + public CT_Marker To { get {