Bug/s1037 (#2338)

* Began handling unique case: Group shape in exChart

* Stopped the crashing. Positions appear inaccurate

* Fixes issue #2337

---------

Co-authored-by: Ossian Edström <ossian.edstrom@epplussoftware.com>

Author: JanKallman

src/EPPlus/Drawing/Chart/ExcelChart.cs

@@ -762,7 +762,16 @@ internal static ExcelChart GetChart(ExcelDrawings drawings, XmlNode node, ExcelG
 
         internal static ExcelChartEx GetChartEx(ExcelDrawings drawings, XmlNode node, ExcelGroupShape parent = null)
         {
-            XmlNode chartDrawingNode = node.SelectSingleNode("mc:AlternateContent/mc:Choice/xdr:graphicFrame/a:graphic/a:graphicData/cx:chart", drawings.NameSpaceManager);
+            XmlNode chartDrawingNode;
+            if (node.Name == "mc:AlternateContent")
+            {
+                chartDrawingNode = node.SelectSingleNode("mc:Choice/xdr:graphicFrame/a:graphic/a:graphicData/cx:chart", drawings.NameSpaceManager);
+            }
+            else
+            {
+                chartDrawingNode = node.SelectSingleNode("mc:AlternateContent/mc:Choice/xdr:graphicFrame/a:graphic/a:graphicData/cx:chart", drawings.NameSpaceManager);
+            }
+
             if (chartDrawingNode != null)
             {
                 var drawingRelation = drawings.Part.GetRelationship(chartDrawingNode.Attributes["r:id"].Value);
@@ -776,25 +785,25 @@ internal static ExcelChartEx GetChartEx(ExcelDrawings drawings, XmlNode node, Ex
                 var layoutId = chartNode.SelectSingleNode("cx:plotArea/cx:plotAreaRegion/cx:series[1]/@layoutId", drawings.NameSpaceManager);
                 if (layoutId == null)
                 {
-                    return new ExcelTreemapChart(drawings, node, uriChart, part, chartXml, chartNode);
+                    return new ExcelTreemapChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                 }
                 switch (layoutId.Value)
                 {
                     case "treemap":
-                        return new ExcelTreemapChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelTreemapChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "sunburst":
-                        return new ExcelSunburstChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelSunburstChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "boxWhisker":
-                        return new ExcelBoxWhiskerChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelBoxWhiskerChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "clusteredColumn":
                     case "pareto":
-                        return new ExcelHistogramChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelHistogramChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "funnel":
-                        return new ExcelFunnelChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelFunnelChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "waterfall":
-                        return new ExcelWaterfallChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelWaterfallChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     case "regionMap":
-                        return new ExcelRegionMapChart(drawings, node, uriChart, part, chartXml, chartNode);
+                        return new ExcelRegionMapChart(drawings, node, uriChart, part, chartXml, chartNode, parent);
                     default:
                         throw new NotSupportedException($"Unsupported chart layout {layoutId.Value}");
                 }

src/EPPlus/Drawing/ExcelDrawing.cs

@@ -644,7 +644,7 @@ internal static ExcelDrawing GetDrawingFromNode(ExcelDrawings drawings, XmlNode
                     }
                     break;
             }
-            return new ExcelDrawing(drawings, node, "", "");
+            return new ExcelDrawing(drawings, node, "", "",parent, DrawingsType);
         }
 
         private static ExcelDrawing GetShapeOrControl(ExcelDrawings drawings, XmlNode node, XmlElement drawNode, ExcelGroupShape parent, DrawingsCollectionType collectionType = DrawingsCollectionType.Worksheet)
@@ -813,19 +813,22 @@ internal int GetPixelTop()
             }
             else
             {
-                var cache = _drawings.Worksheet.RowHeightCache;
-                for (int row = 0; row < From.Row; row++)
+                if (From != null)
                 {
-                    lock (cache)
+                    var cache = _drawings.Worksheet.RowHeightCache;
+                    for (int row = 0; row < From.Row; row++)
                     {
-                        if (!cache.ContainsKey(row))
+                        lock (cache)
                         {
-                            cache.Add(row, _drawings.Worksheet.GetRowHeight(row + 1));
+                            if (!cache.ContainsKey(row))
+                            {
+                                cache.Add(row, _drawings.Worksheet.GetRowHeight(row + 1));
+                            }
                         }
+                        pix += (int)(cache[row] / 0.75);
                     }
-                    pix += (int)(cache[row] / 0.75);
+                    pix += From.RowOff / EMU_PER_PIXEL;
                 }
-                pix += From.RowOff / EMU_PER_PIXEL;
             }
             return pix;
         }

src/EPPlus/Drawing/ExcelGroupShape.cs

@@ -51,10 +51,13 @@ private void AddDrawings()
                 if (node.LocalName != "nvGrpSpPr" && node.LocalName != "grpSpPr")
                 {
                     var grpDraw = ExcelDrawing.GetDrawingFromNode(_parent._drawings, node, (XmlElement)node, _parent, _drawingsCollectionType);
-                    _groupDrawings.Add(grpDraw);
-                    if (_drawingNames.ContainsKey(grpDraw.Name) == false)
+                    if(grpDraw != null)
                     {
-                        _drawingNames.Add(grpDraw.Name, _groupDrawings.Count - 1);
+                        _groupDrawings.Add(grpDraw);
+                        if (_drawingNames.ContainsKey(grpDraw.Name) == false)
+                        {
+                            _drawingNames.Add(grpDraw.Name, _groupDrawings.Count - 1);
+                        }
                     }
                 }
             }

src/EPPlusTest/Issues/ChartIssues.cs

@@ -399,9 +399,9 @@ public void s968()
 			SaveAndCleanup(package);
 		}
 
-        [TestMethod]
-        public void CreateStringLiterals()
-        {
+		[TestMethod]
+		public void CreateStringLiterals()
+		{
 			using (var package = OpenPackage("LiteralsSetting.xlsx", true))
 			{
 				var wb = package.Workbook;
@@ -411,23 +411,49 @@ public void CreateStringLiterals()
 
 				var serie = numLitChart.Series.Add("{10,20,50}");
 				serie.XSeries = "{'col1','col2','col3'}";
-                SaveAndCleanup(package);
-            }
-        }
-        [TestMethod]
-        public void s981()
-        {
-            using (var package = OpenTemplatePackage("s981.xlsx"))
-            {
-                var wb = package.Workbook;
-                var ws = wb.Worksheets["Summary"];
+				SaveAndCleanup(package);
+			}
+		}
+		[TestMethod]
+		public void s981()
+		{
+			using (var package = OpenTemplatePackage("s981.xlsx"))
+			{
+				var wb = package.Workbook;
+				var ws = wb.Worksheets["Summary"];
 
 				var chart = ws.Drawings[0].As.Chart.ScatterChart;
 
-                chart.StyleManager.SetChartStyle(ePresetChartStyleMultiSeries.ScatterChartStyle3);
+				chart.StyleManager.SetChartStyle(ePresetChartStyleMultiSeries.ScatterChartStyle3);
+
+				SaveAndCleanup(package);
+			}
+		}
+
+		[TestMethod]
+		public void s1037()
+		{
+			using (var package = OpenTemplatePackage("s1037.xlsx"))
+			{
+				//Crashes on save (also accesssing)
+				SaveAndCleanup(package);
+			}
+		}
+
+        [TestMethod]
+        public void s1038()
+		{
+            using (var package = OpenTemplatePackage("s1038.xlsx"))
+            {
+                var worksheet = package.Workbook.Worksheets["Tabelle1"];
+                var groupShape = worksheet.Drawings[0] as ExcelGroupShape;
+
+				//Crashes when accessesing
+                var drawingsWithinGroupShape = groupShape.Drawings;
 
-                SaveAndCleanup(package);
+				SaveAndCleanup(package);
             }
         }
+
     }
 }