Allowed for save of groups containing drawings with same name (#902)

EPPlusSoftware · Jun 9, 2023 · 83e33c3 · 83e33c3
1 parent 530694f
commit 83e33c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/EPPlus/Drawing/ExcelGroupShape.cs b/src/EPPlus/Drawing/ExcelGroupShape.cs
@@ -47,7 +47,10 @@ private void AddDrawings()
                 {
                     var grpDraw = ExcelDrawing.GetDrawingFromNode(_parent._drawings, node, (XmlElement)node, _parent);
                     _groupDrawings.Add(grpDraw);
-                    _drawingNames.Add(grpDraw.Name, _groupDrawings.Count - 1);
+                    if (_drawingNames.ContainsKey(grpDraw.Name) == false)
+                    {
+                        _drawingNames.Add(grpDraw.Name, _groupDrawings.Count - 1);
+                    }
                 }
             }
         }

diff --git a/src/EPPlusTest/Issues.cs b/src/EPPlusTest/Issues.cs
@@ -4902,6 +4902,18 @@ public void s466()
             }
         }
         [TestMethod]
+        public void i898()
+        {
+            using (var package = OpenTemplatePackage("i898DoubleGroup.xlsx"))
+            {
+                var sheet = package.Workbook.Worksheets[0];
+
+                sheet.Cells["A1"].Value = 1;
+
+                //Ensure saving of drawings with same name when read from file is possible
+                SaveAndCleanup(package);
+            }
+        }
         public void s473()
         {
             using (var p = OpenPackage("tableCopyTest.xlsx", true))