From d31d5d312e189883b8d7e4d025f67ff36f2f1669 Mon Sep 17 00:00:00 2001
From: Tony Qu <tonyqus@gmail.com>
Date: Tue, 16 Apr 2024 08:46:58 +0800
Subject: [PATCH] adjust Word openxml serialization

---
 OpenXmlFormats/Drawing/WordprocessingDrawing.cs |  8 ++++----
 OpenXmlFormats/Wordprocessing/Font.cs           | 13 +++++++------
 OpenXmlFormats/Wordprocessing/Styles.cs         |  2 +-
 OpenXmlFormats/Wordprocessing/Table.cs          |  6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/OpenXmlFormats/Drawing/WordprocessingDrawing.cs b/OpenXmlFormats/Drawing/WordprocessingDrawing.cs
index 052c69803..700c7c54b 100644
--- a/OpenXmlFormats/Drawing/WordprocessingDrawing.cs
+++ b/OpenXmlFormats/Drawing/WordprocessingDrawing.cs
@@ -444,10 +444,10 @@ public static CT_Inline Parse(XmlNode node, XmlNamespaceManager namespaceManager
             if (node == null)
                 return null;
             CT_Inline ctObj = new CT_Inline();
-            ctObj.distT = XmlHelper.ReadUInt(node.Attributes["wp:distT"]);
-            ctObj.distB = XmlHelper.ReadUInt(node.Attributes["wp:distB"]);
-            ctObj.distL = XmlHelper.ReadUInt(node.Attributes["wp:distL"]);
-            ctObj.distR = XmlHelper.ReadUInt(node.Attributes["wp:distR"]);
+            ctObj.distT = XmlHelper.ReadUInt(node.Attributes["distT"]);
+            ctObj.distB = XmlHelper.ReadUInt(node.Attributes["distB"]);
+            ctObj.distL = XmlHelper.ReadUInt(node.Attributes["distL"]);
+            ctObj.distR = XmlHelper.ReadUInt(node.Attributes["distR"]);
             foreach (XmlNode childNode in node.ChildNodes)
             {
                 if (childNode.LocalName == "extent")
diff --git a/OpenXmlFormats/Wordprocessing/Font.cs b/OpenXmlFormats/Wordprocessing/Font.cs
index 29d043cd6..bcf41995b 100644
--- a/OpenXmlFormats/Wordprocessing/Font.cs
+++ b/OpenXmlFormats/Wordprocessing/Font.cs
@@ -488,16 +488,17 @@ public static CT_Fonts Parse(XmlNode node, XmlNamespaceManager namespaceManager)
         internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<w:{0}", nodeName));
-            if (this.hint != ST_Hint.@default || this.hintFieldSpecified)
-                XmlHelper.WriteAttribute(sw, "w:hint", this.hint.ToString());
             XmlHelper.WriteAttribute(sw, "w:ascii", this.ascii);
-            XmlHelper.WriteAttribute(sw, "w:hAnsi", this.hAnsi);
+            if(this.eastAsiaTheme !=null)
+                XmlHelper.WriteAttribute(sw, "w:eastAsiaTheme", this.eastAsiaTheme.ToString());
             XmlHelper.WriteAttribute(sw, "w:eastAsia", this.eastAsia);
+            XmlHelper.WriteAttribute(sw, "w:hAnsi", this.hAnsi);
             XmlHelper.WriteAttribute(sw, "w:cs", this.cs);
-            if (this.asciiTheme != null)
+            if(this.hint != ST_Hint.@default || this.hintFieldSpecified)
+                XmlHelper.WriteAttribute(sw, "w:hint", this.hint.ToString());
+
+            if(this.asciiTheme != null)
                 XmlHelper.WriteAttribute(sw, "w:asciiTheme", this.asciiTheme.ToString());
-            if (this.eastAsiaTheme !=null)
-                XmlHelper.WriteAttribute(sw, "w:eastAsiaTheme", this.eastAsiaTheme.ToString());
             if (this.hAnsiTheme != ST_Theme.majorEastAsia)
                 XmlHelper.WriteAttribute(sw, "w:hAnsiTheme", this.hAnsiTheme.ToString());
             if (this.cstheme != null)
diff --git a/OpenXmlFormats/Wordprocessing/Styles.cs b/OpenXmlFormats/Wordprocessing/Styles.cs
index 0f289d38b..2c9e62bbd 100644
--- a/OpenXmlFormats/Wordprocessing/Styles.cs
+++ b/OpenXmlFormats/Wordprocessing/Styles.cs
@@ -2304,11 +2304,11 @@ internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<w:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "w:val", this.val.ToString());
-            XmlHelper.WriteAttribute(sw, "w:color", this.color);
             if (this.sz != null)
                 XmlHelper.WriteAttribute(sw, "w:sz", (ulong)this.sz, true);
            if (this.space != null)
                XmlHelper.WriteAttribute(sw, "w:space", (ulong)this.space, true);
+            XmlHelper.WriteAttribute(sw, "w:color", this.color);
             if(this.themeColor!= ST_ThemeColor.none)
                 XmlHelper.WriteAttribute(sw, "w:themeColor", this.themeColor.ToString());
             XmlHelper.WriteAttribute(sw, "w:themeTint", this.themeTint);
diff --git a/OpenXmlFormats/Wordprocessing/Table.cs b/OpenXmlFormats/Wordprocessing/Table.cs
index 5080e6e6e..3e1e68527 100644
--- a/OpenXmlFormats/Wordprocessing/Table.cs
+++ b/OpenXmlFormats/Wordprocessing/Table.cs
@@ -1912,9 +1912,9 @@ public static CT_Height Parse(XmlNode node, XmlNamespaceManager namespaceManager
         internal void Write(StreamWriter sw, string nodeName)
         {
             sw.Write(string.Format("<w:{0}", nodeName));
-            XmlHelper.WriteAttribute(sw, "w:val", this.val);
             if(this.hRule!= ST_HeightRule.auto)
                 XmlHelper.WriteAttribute(sw, "w:hRule", this.hRule.ToString());
+            XmlHelper.WriteAttribute(sw, "w:val", this.val);
             sw.Write("/>");
         }
 
@@ -5703,8 +5703,8 @@ internal void Write(StreamWriter sw, string nodeName)
             sw.Write(string.Format("<w:{0}", nodeName));
             XmlHelper.WriteAttribute(sw, "w:rsidR", this.rsidR);
             XmlHelper.WriteAttribute(sw, "w:rsidRPr", this.rsidRPr);
-            //XmlHelper.WriteAttribute(sw, "w14:paraId", this.paraIdField);
-            //XmlHelper.WriteAttribute(sw, "w14:textId", this.textIdField);
+            XmlHelper.WriteAttribute(sw, "w14:paraId", this.paraIdField);
+            XmlHelper.WriteAttribute(sw, "w14:textId", this.textIdField);
             XmlHelper.WriteAttribute(sw, "w:rsidDel", this.rsidDel);
             XmlHelper.WriteAttribute(sw, "w:rsidTr", this.rsidTr);
             sw.Write(">");