Fixes issue #415

Author: JanKallman

docs/articles/fixedissues.md

@@ -3,17 +3,17 @@
 ## Version 5.7.0
 ### Fixed issues
 ### Features
-* External References
+* External links
 	* Adding, removing and break links to external workbooks.
 	* Updating external workbook value/defined name caches.
 	* Using external workbook caches in the formula parser.
-	* Using loaded external package (workbook) in the formula parser.
-* Enhances sorting support.
+	* Using loaded external packages (workbooks) in the formula parser.
+* Enhanced sorting 
 	* Pivot table auto sort - Sort on data fields using pivot areas.
 	* Sort state in tables and auto filters. 
 	* Left-to-right sorting and sorting with custom lists.
 
-* Support for Show Data As on pivot table data field
+* Support for Show Data As on pivot table data fields
 ### Fixed issues
 * Support for ErrorBars on both X and Y axis on scatter, bubble and area charts.
 * Copying a worksheet to a new package fails with named styles in some cases. 

src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs

@@ -58,7 +58,7 @@ internal static ExcelWorksheet Copy(ExcelWorksheets worksheets, string name, Exc
                 pck.ZipPackage.Flush();
 
                 //Create a relation to the workbook
-                string relID = worksheets.CreateWorkbookRel(name, sheetID, uriWorksheet, false);
+                string relID = worksheets.CreateWorkbookRel(name, sheetID, uriWorksheet, false, null);
 
                 ExcelWorksheet added = new ExcelWorksheet(nsm, pck, relID, uriWorksheet, name, sheetID, worksheets.Count + pck._worksheetAdd, eWorkSheetHidden.Visible);
 

src/EPPlus/ExcelWorksheet.cs

@@ -473,7 +473,7 @@ internal void LoadThreadedComments()
         /// <summary>
         /// The unique identifier for the worksheet.
         /// </summary>
-        internal int SheetId { get { return (_sheetID); } }
+        internal int SheetId { get { return (_sheetID); } set { _sheetID = value; } }
 
         internal static bool NameNeedsApostrophes(string ws)
         {

src/EPPlus/ExcelWorksheets.cs

@@ -62,13 +62,19 @@ internal ExcelWorksheets(ExcelPackage pck, XmlNamespaceManager nsm, XmlNode topN
                     string relId = sheetNode.Attributes.GetNamedItem("id", ExcelPackage.schemaRelationships).Value;
                     int sheetID = Convert.ToInt32(sheetNode.Attributes["sheetId"].Value);
 
-                    if (!String.IsNullOrEmpty(relId))
+                    if (string.IsNullOrEmpty(relId))
+                    {
+                        var ws = AddSheet(name, false, null, null, (XmlElement)sheetNode);
+                        ws.SheetId = sheetID;
+                        //_worksheets.Add(ix, ws);
+                    }
+                    else
                     {
                         var sheetRelation = pck.Workbook.Part.GetRelationship(relId);
                         Uri uriWorksheet = UriHelper.ResolvePartUri(pck.Workbook.WorkbookUri, sheetRelation.TargetUri);
 
-                        //add the worksheet
                         int positionID = ix + _pck._worksheetAdd;
+                        //add the worksheet
                         if (sheetRelation.RelationshipType.EndsWith("chartsheet"))
                         {
                             _worksheets.Add(ix, new ExcelChartsheet(_namespaceManager, _pck, relId, uriWorksheet, name, sheetID, positionID, null));
@@ -77,8 +83,8 @@ internal ExcelWorksheets(ExcelPackage pck, XmlNamespaceManager nsm, XmlNode topN
                         {
                             _worksheets.Add(ix, new ExcelWorksheet(_namespaceManager, _pck, relId, uriWorksheet, name, sheetID, positionID, null));
                         }
-                        ix++;
                     }
+                    ix++;
                 }
             }
         }
@@ -135,8 +141,8 @@ public ExcelWorksheet Add(string Name)
             ExcelWorksheet worksheet = AddSheet(Name, false, null);
             return worksheet;
         }
-        private ExcelWorksheet AddSheet(string Name, bool isChart, eChartType? chartType, ExcelPivotTable pivotTableSource = null)
-        {
+        private ExcelWorksheet AddSheet(string Name, bool isChart, eChartType? chartType, ExcelPivotTable pivotTableSource = null, XmlElement sheetElement=null)
+        {   
             lock (_worksheets)
             {
                 Name = ValidateFixSheetName(Name);
@@ -153,7 +159,7 @@ private ExcelWorksheet AddSheet(string Name, bool isChart, eChartType? chartType
                 worksheetXml.Save(streamWorksheet);
                 _pck.ZipPackage.Flush();
 
-                string rel = CreateWorkbookRel(Name, sheetID, uriWorksheet, isChart);
+                string rel = CreateWorkbookRel(Name, sheetID, uriWorksheet, isChart, sheetElement);
 
                 int positionID = _worksheets.Count + _pck._worksheetAdd;
                 ExcelWorksheet worksheet;
@@ -246,19 +252,22 @@ public ExcelChartsheet AddStockChart(string Name, ExcelRangeBase CategorySerie,
         }
 
 
-        internal string CreateWorkbookRel(string Name, int sheetID, Uri uriWorksheet, bool isChart)
+        internal string CreateWorkbookRel(string Name, int sheetID, Uri uriWorksheet, bool isChart, XmlElement sheetElement)
         {
             //Create the relationship between the workbook and the new worksheet
             var rel = _pck.Workbook.Part.CreateRelationship(UriHelper.GetRelativeUri(_pck.Workbook.WorkbookUri, uriWorksheet), Packaging.TargetMode.Internal, ExcelPackage.schemaRelationships + "/" + (isChart ? "chartsheet" : "worksheet"));
             _pck.ZipPackage.Flush();
 
             //Create the new sheet node
-            XmlElement worksheetNode = _pck.Workbook.WorkbookXml.CreateElement("sheet", ExcelPackage.schemaMain);
-            worksheetNode.SetAttribute("name", Name);
-            worksheetNode.SetAttribute("sheetId", sheetID.ToString());
-            worksheetNode.SetAttribute("id", ExcelPackage.schemaRelationships, rel.Id);
+            if(sheetElement==null)
+            {
+                sheetElement = _pck.Workbook.WorkbookXml.CreateElement("sheet", ExcelPackage.schemaMain);
+                sheetElement.SetAttribute("name", Name);
+                sheetElement.SetAttribute("sheetId", sheetID.ToString());
+                TopNode.AppendChild(sheetElement);
+            }
+            sheetElement.SetAttribute("id", ExcelPackage.schemaRelationships, rel.Id);
 
-            TopNode.AppendChild(worksheetNode);
             return rel.Id;
         }
 

src/EPPlusTest/Issues.cs

@@ -2246,6 +2246,16 @@ public void Issue410()
                 SaveWorkbook("test-out.xlsx", package);
             }
         }
+        [TestMethod]
+        public void Issue415()
+        {
+            using (var package = OpenTemplatePackage("Issue415.xlsm"))
+            {
+                var wb = package.Workbook;
+                SaveAndCleanup(package);
+            }
+        }
+
     }
 }