Merge pull request #2255 from EPPlusSoftware/bug/issue2254

Fixes issue 2254

Author: AdrianEPPlus

src/EPPlus/Data/CustomXml/ExcelCustomXml.cs

@@ -107,24 +107,25 @@ internal void Save(ExcelPackage pck)
                 var nsm = CreateNsm();
                 _xmlHelper = XmlHelperFactory.Create(nsm, PropertiesXml.DocumentElement.SelectSingleNode("ds:schemaRefs", nsm));
             }
-            _xmlHelper.TopNode.InnerXml = "";
-            foreach (var schemaRef in SchemasReferences)
+            if (_xmlHelper != null)
             {
-                XmlElement schemaRefNode = (XmlElement)_xmlHelper.CreateNode("ds:schemaRef");
-                schemaRefNode.SetAttribute("uri", CreateNsm().LookupNamespace("ds"), schemaRef);
-                _xmlHelper.TopNode.AppendChild(schemaRefNode);
+                _xmlHelper.TopNode.InnerXml = "";
+                foreach (var schemaRef in SchemasReferences)
+                {
+                    XmlElement schemaRefNode = (XmlElement)_xmlHelper.CreateNode("ds:schemaRef");
+                    schemaRefNode.SetAttribute("uri", CreateNsm().LookupNamespace("ds"), schemaRef);
+                    _xmlHelper.TopNode.AppendChild(schemaRefNode);
+                }
             }
-
-            var xmlSettings = new XmlWriterSettings() ;
+            var xmlSettings = new XmlWriterSettings();
 
             var stream = Part.GetStream(FileMode.Create, FileAccess.Write);
             var xmlWriter = XmlWriter.Create(stream, xmlSettings);
             CustomXml.Save(xmlWriter);
 
             stream = PropertiesPart.GetStream(FileMode.Create, FileAccess.Write);
-            xmlWriter = XmlWriter.Create(stream, xmlSettings); 
+            xmlWriter = XmlWriter.Create(stream, xmlSettings);
             PropertiesXml.Save(xmlWriter);
-
         }
     }
 }

src/EPPlus/Data/CustomXml/ExcelCustomXmlCollection.cs

@@ -63,6 +63,10 @@ internal void Add(ExcelCustomXml customXml)
         {
             _list.Add(customXml);
         }
+        internal bool Contains(ExcelCustomXml customXml)
+        {
+            return _list.Contains(customXml);
+        }
         internal void Remove(ExcelCustomXml customXml)
         {
             _package.ZipPackage.DeletePart(customXml.Part.Uri);

src/EPPlus/Data/PowerQuery/ExcelPowerQuerySettings.cs

@@ -270,10 +270,11 @@ internal void Save(ExcelCustomXmlCollection customXml)
             }
 
             cx.CustomXml.LoadXml($"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><DataMashup xmlns=\"{Schemas.schemaDataMashup}\">{Convert.ToBase64String(retMs.ToArray())}</DataMashup>");
-            customXml.Add(cx);
+            if (customXml.Contains(cx) == false)
+            {
+                customXml.Add(cx);
+            }
         }
-
-
         private byte[] GetMetaDataBytes()
         {
             var bw = new BinaryWriter(new MemoryStream());

src/EPPlus/Style/ExcelTextFont.cs

@@ -310,7 +310,7 @@ public void SetFromFont(string name, float size, bool bold = false, bool italic
             if (bold) Bold = bold;
             if (italic) Italic = italic;
             if (underline) UnderLine = eUnderLineType.Single;
-            if (strikeout) Strike = eStrikeType.Single;            
+            if (strikeout) Strike = eStrikeType.Single;
         }
     }
 }

src/EPPlusTest/Issues/TableIssues.cs

@@ -410,5 +410,14 @@ public void RemoveAndReAddCalculatedColumnFormula()
                 Assert.AreEqual("ROW()-1", sheet1.Cells["A2"].Formula);
             }
         }
+        [TestMethod]
+        public void s997()
+        {
+            using (var package = OpenTemplatePackage("s997.xlsx"))
+            {
+                var t = package.Workbook.Worksheets.First().Tables;
+                SaveAndCleanup(package);
+            }
+        }
+        }
     }
-}