Merge branch 'master' into poi/v3.17-patch14

Author: antony-liu

OpenXmlFormats/Wordprocessing/Document.cs

@@ -78,10 +78,24 @@ public static CT_Document Parse(XmlNode node, XmlNamespaceManager namespaceManag
             if(node == null)
                 return null;
             CT_Document ctObj = new CT_Document();
+            bool firstBody = true;
             foreach(XmlNode childNode in node.ChildNodes)
             {
                 if(childNode.LocalName == "body")
-                    ctObj.body = CT_Body.Parse(childNode, namespaceManager);
+                {
+                    if(firstBody)
+                    {
+                        ctObj.body = CT_Body.Parse(childNode, namespaceManager);
+                        firstBody = false;
+                    }
+                    else
+                    {
+                        if(ctObj.bodyListField == null)
+                            ctObj.bodyListField = new List<CT_Body> ();
+                        ctObj.bodyListField.Add(CT_Body.Parse(childNode, namespaceManager));
+                    }
+                }
+                    
                 else if(childNode.LocalName == "background")
                     ctObj.background = CT_Background.Parse(childNode, namespaceManager);
             }
@@ -111,6 +125,13 @@ internal void Write(StreamWriter sw)
             sw.Write("mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14\">");
             if(this.body != null)
                 this.body.Write(sw, "body");
+            if(this.bodyList != null)
+            {
+                foreach(var b in this.bodyList)
+                {
+                    b.Write(sw, "body");
+                }
+            }
             if(this.background != null)
                 this.background.Write(sw, "background");
             sw.Write("</w:document>");
@@ -123,6 +144,8 @@ public CT_Document()
             this.bodyField = new CT_Body();
         }
 
+        private List<CT_Body> bodyListField;
+
         [XmlElement(Order = 0)]
         public CT_Body body
         {
@@ -136,6 +159,14 @@ public CT_Body body
             }
         }
 
+        public List<CT_Body> bodyList
+        {
+            get
+            {
+                return bodyListField;
+            }
+        }
+
         public void AddNewBody()
         {
             this.bodyField = new CT_Body();