Bug/issue2220 (#2221)

* Fixed issue #2218

* Fixes issue #2220

Author: JanKallman

src/EPPlus/Drawing/Chart/ExcelChartStandard.cs

@@ -80,7 +80,7 @@ internal ExcelChartStandard(ExcelDrawings drawings, XmlNode node, Uri uriChart,
            base(drawings, node, chartXml, parent, drawingPath, nvPrPath)
         {
             var originalPtSource = _chartXmlHelper.GetXmlNodeString("c:pivotSource/c:name");
-            if (!string.IsNullOrEmpty(originalPtSource))
+            if(!string.IsNullOrEmpty(originalPtSource))
             {
                 var ptSource = originalPtSource;
                 if (ptSource.StartsWith("["))
@@ -113,6 +113,7 @@ internal ExcelChartStandard(ExcelChart topChart, XmlNode chartNode, ExcelGroupSh
             _plotArea = topChart.PlotArea;
             _chartNode = chartNode;
             InitChartLoad(topChart._drawings, chartNode, false);
+            ChartType = GetChartType(chartNode.LocalName);
         }
         private void InitChartLoad(ExcelDrawings drawings, XmlNode chartNode, bool isPivot)
         {

src/EPPlus/Drawing/Chart/Style/ExcelChartStyleManager.cs

@@ -684,12 +684,12 @@ private void ApplyAxis()
         }
 
         internal void ApplySeries()
-        {   
+        {
+            int serieNo = 0;
             foreach (var chart in _chart.PlotArea.ChartTypes)
             {
                 var dataPoint = GetDataPointStyle(chart);
                 var applyFill = (!chart.IsTypeLine() || chart.ChartType == eChartType.Line3D || chart.ChartType == eChartType.XYScatter);   //Lines have no fill, except Line3D
-                int serieNo = 0;
                 foreach (ExcelChartSerie serie in chart.Series)
                 {
                     //Note: Datalabels are applied in the ApplyDataLabels method

src/EPPlusTest/Drawing/Chart/SeriesTest.cs

@@ -118,8 +118,7 @@ public void ChartSeriesLitStringYNumX()
             {
                 var ws = p.Workbook.Worksheets.Add("InvalidStrLit");
                 var lineChart = ws.Drawings.AddLineChart("LineChart1", OfficeOpenXml.Drawing.Chart.eLineChartType.Line);
-                var serie = lineChart.Series.Add("{\"Label1\",\"Label 2\",\"Something else\"}", "{120.3,14,5000.0005}");
-                
+                var serie = lineChart.Series.Add("{\"Label1\",\"Label 2\",\"Something else\"}", "{120.3,14,5000.0005}");                
             }
         }
     }

src/EPPlusTest/Issues/ChartIssues.cs

@@ -414,5 +414,20 @@ public void CreateStringLiterals()
                 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);
+
+                SaveAndCleanup(package);
+            }
+        }
     }
 }