Browse Source

Update some ToString functions

pull/1559/head
Tim Lee 2 months ago
parent
commit
d554149489
  1. 11
      OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs
  2. 37
      OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs
  3. 9
      OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs
  4. 13
      OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs
  5. 2
      ooxml/XSSF/UserModel/XSSFClientAnchor.cs

11
OpenXmlFormats/Spreadsheet/Styles/CT_Border.cs

@ -61,16 +61,15 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
}
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)

37
OpenXmlFormats/Spreadsheet/Styles/CT_Colors.cs

@ -75,6 +75,17 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
sw.Write(string.Format("</{0}>", 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 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
}
#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 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
return ctObj;
}
internal void Write(StreamWriter sw, string nodeName)
{
sw.Write(string.Format("<{0}", nodeName));
@ -383,6 +379,17 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
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();

9
OpenXmlFormats/Spreadsheet/Styles/CT_Font.cs

@ -183,15 +183,6 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
sw.Write(string.Format("</{0}>", 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

13
OpenXmlFormats/Spreadsheet/Styles/CT_Xf.cs

@ -150,12 +150,13 @@ namespace NPOI.OpenXmlFormats.Spreadsheet
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()

2
ooxml/XSSF/UserModel/XSSFClientAnchor.cs

@ -273,7 +273,7 @@ lblforbreak:
* @return ending anchor point
*/
internal CT_Marker To
public CT_Marker To
{
get
{

Loading…
Cancel
Save