ensured files with many defined names open faster in excel (#1242)

Author: OssianEPPlus

src/EPPlus/ExcelWorkbook.cs

@@ -1392,6 +1392,7 @@ private void SaveSharedStringHandler(ZipOutputStream stream, CompressionLevel co
         }
         private void UpdateDefinedNamesXml()
         {
+            List<ExcelNamedRange> nameList = new List<ExcelNamedRange>();
             try
             {
                 XmlNode top = WorkbookXml.SelectSingleNode("//d:definedNames", NameSpaceManager);
@@ -1413,13 +1414,7 @@ private void UpdateDefinedNamesXml()
                     }
                     foreach (ExcelNamedRange name in _names)
                     {
-
-                        XmlElement elem = WorkbookXml.CreateElement("definedName", ExcelPackage.schemaMain);
-                        top.AppendChild(elem);
-                        elem.SetAttribute("name", name.Name);
-                        if (name.IsNameHidden) elem.SetAttribute("hidden", "1");
-                        if (!string.IsNullOrEmpty(name.NameComment)) elem.SetAttribute("comment", name.NameComment);
-                        SetNameElement(name, elem);
+                        nameList.Add(name);
                     }
                 }
                 foreach (ExcelWorksheet ws in _worksheets)
@@ -1428,16 +1423,38 @@ private void UpdateDefinedNamesXml()
                     {
                         foreach (ExcelNamedRange name in ws.Names)
                         {
-                            XmlElement elem = WorkbookXml.CreateElement("definedName", ExcelPackage.schemaMain);
-                            top.AppendChild(elem);
-                            elem.SetAttribute("name", name.Name);
-                            elem.SetAttribute("localSheetId", name.LocalSheetId.ToString());
-                            if (name.IsNameHidden) elem.SetAttribute("hidden", "1");
-                            if (!string.IsNullOrEmpty(name.NameComment)) elem.SetAttribute("comment", name.NameComment);
-                            SetNameElement(name, elem);
+                            nameList.Add(name);
                         }
                     }
                 }
+
+                nameList.Sort(delegate (ExcelNamedRange x, ExcelNamedRange y)
+                {
+                    var result = x.Name.CompareTo(y.Name);
+
+                    if (result == 0)
+                    {
+                        var nameX = x.LocalSheetId <= -1 ? "" : x.LocalSheet.Name;
+                        var nameY = y.LocalSheetId <= -1 ? "" : y.LocalSheet.Name;
+
+                        result = nameX.CompareTo(nameY);
+                    }
+                    return result;
+                });
+
+                foreach (var name in nameList)
+                {
+                    XmlElement elem = WorkbookXml.CreateElement("definedName", ExcelPackage.schemaMain);
+                    top.AppendChild(elem);
+                    elem.SetAttribute("name", name.Name);
+                    if (name.LocalSheetId != -1)
+                    {
+                        elem.SetAttribute("localSheetId", name.LocalSheetId.ToString());
+                    }
+                    if (name.IsNameHidden) elem.SetAttribute("hidden", "1");
+                    if (!string.IsNullOrEmpty(name.NameComment)) elem.SetAttribute("comment", name.NameComment);
+                    SetNameElement(name, elem);
+                }
             }
             catch (Exception ex)
             {

src/EPPlusTest/Issues.cs

@@ -5643,5 +5643,15 @@ public void s580()
 			}
 		}
 
-	}
+        [TestMethod]
+        public void I1238()
+        {
+            using (var p = OpenTemplatePackage("I1238SlowWorkbook.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                ws.Cells["A1"].Value = 1;
+                SaveAndCleanup(p);
+            }
+        }
+    }
 }