update chart serialization behavior

pragmaware · Oct 9, 2021 · 238a078 · 238a078
1 parent 5e9e2a5
commit 238a078
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/OpenXmlFormats/Drawing/Chart/Chart.cs b/OpenXmlFormats/Drawing/Chart/Chart.cs
@@ -1406,8 +1406,7 @@ internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<c:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "val", this.val, true);
-            sw.Write(">");
-            sw.Write(string.Format("</c:{0}>", nodeName));
+            sw.Write("/>");
         }
 
     }
@@ -2342,8 +2341,7 @@ internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<c:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "val", this.val);
-            sw.Write(">");
-            sw.Write(string.Format("</c:{0}>", nodeName));
+            sw.Write("/>");
         }
 
         [XmlAttribute]
@@ -2979,8 +2977,7 @@ public static CT_Scaling Parse(XmlNode node, XmlNamespaceManager namespaceManage
 
         internal void Write(StreamWriter sw, string nodeName)
         {
-            sw.Write(string.Format("<c:{0}", nodeName));
-            sw.Write(">");
+            sw.Write(string.Format("<c:{0}>", nodeName));
             if (this.logBase != null)
                 this.logBase.Write(sw, "logBase");
             if (this.orientation != null)
@@ -3125,8 +3122,7 @@ internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<c:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "val", this.val);
-            sw.Write(">");
-            sw.Write(string.Format("</c:{0}>", nodeName));
+            sw.Write("/>");
         }
 
         private double valField;
@@ -3176,8 +3172,7 @@ internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<c:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "val", this.val.ToString());
-            sw.Write(">");
-            sw.Write(string.Format("</c:{0}>", nodeName));
+            sw.Write("/>");
         }
 
         [XmlAttribute]

diff --git a/OpenXmlFormats/Spreadsheet/Sheet/CT_Row.cs b/OpenXmlFormats/Spreadsheet/Sheet/CT_Row.cs
@@ -160,23 +160,23 @@ public bool IsSetHt()
         {
             return this.htField >=0;
         }
-        public void unSetHt()
+        public void UnsetHt()
         {
             this.htField = -1;
         }
         public bool IsSetCustomHeight()
         {
             return this.customHeightField != false;
         }
-        public void unSetCustomHeight()
+        public void UnsetCustomHeight()
         {
             this.customHeightField = false;
         }
         public bool IsSetS()
         {
             return this.sField != 0;
         }
-        public void unsetHidden()
+        public void UnsetHidden()
         {
             this.hiddenField = false;
         }

diff --git a/ooxml/XSSF/UserModel/XSSFRow.cs b/ooxml/XSSF/UserModel/XSSFRow.cs
@@ -351,8 +351,8 @@ public short Height
             {
                 if (value < 0)
                 {
-                    if (_row.IsSetHt()) _row.unSetHt();
-                    if (_row.IsSetCustomHeight()) _row.unSetCustomHeight();
+                    if (_row.IsSetHt()) _row.UnsetHt();
+                    if (_row.IsSetCustomHeight()) _row.UnsetCustomHeight();
                 }
                 else
                 {

diff --git a/ooxml/XSSF/UserModel/XSSFSheet.cs b/ooxml/XSSF/UserModel/XSSFSheet.cs
@@ -2896,11 +2896,11 @@ private void ExpandRow(int rowNumber)
                     if (row.GetCTRow().outlineLevel == ((XSSFRow)GetRow(i)).GetCTRow()
                             .outlineLevel)
                     {
-                        ((XSSFRow)GetRow(i)).GetCTRow().unsetHidden();
+                        ((XSSFRow)GetRow(i)).GetCTRow().UnsetHidden();
                     }
                     else if (!IsRowGroupCollapsed(i))
                     {
-                        ((XSSFRow)GetRow(i)).GetCTRow().unsetHidden();
+                        ((XSSFRow)GetRow(i)).GetCTRow().UnsetHidden();
                     }
                 }
             }
@@ -4986,7 +4986,7 @@ private static void CopyRow(XSSFSheet srcSheet, XSSFSheet destSheet, XSSFRow src
             if (!srcRow.GetCTRow().IsSetCustomHeight())
             {
                 //Copying height sets the custom height flag, but Excel will set a value for height even if it's auto-sized.
-                destRow.GetCTRow().unSetCustomHeight();
+                destRow.GetCTRow().UnsetCustomHeight();
             }
             destRow.Hidden = srcRow.Hidden;
             destRow.Collapsed = srcRow.Collapsed;