Fixes issue #1982 and #2002

Author: JanKallman

src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/RangeCriteriaFunction.cs

@@ -179,19 +179,21 @@ protected static Queue<FormulaRangeAddress> EnqueueMatchingAddresses(FormulaRang
             var pIx = int.MinValue;
             var extRef = valueAddress.ExternalReferenceIx;
             var wsIx = valueAddress.WorksheetIx;
+            FormulaRangeAddress currentAddress=null;
             if (valueAddress.FromCol == valueAddress.ToCol)
             {
                 var c = valueAddress.FromCol;
                 foreach (var ix in matchIndexes)
                 {
                     if (ix == pIx + 1)
                     {
-                        addresses.Peek().ToRow++;
+                        currentAddress.ToRow++;
                     }
                     else
                     {
                         var r = valueAddress.FromRow + ix;
-                        addresses.Enqueue(new FormulaRangeAddress() { ExternalReferenceIx=extRef, WorksheetIx = wsIx, FromRow = r, ToRow = r, FromCol = c, ToCol = c });
+                        currentAddress = new FormulaRangeAddress() { ExternalReferenceIx = extRef, WorksheetIx = wsIx, FromRow = r, ToRow = r, FromCol = c, ToCol = c };
+                        addresses.Enqueue(currentAddress);
                     }
                     pIx = ix;
                 }
@@ -203,12 +205,13 @@ protected static Queue<FormulaRangeAddress> EnqueueMatchingAddresses(FormulaRang
                 {
                     if (ix == pIx + 1)
                     {
-                        addresses.Peek().ToCol++;
+                        currentAddress.ToCol++;
                     }
                     else
                     {
                         var c = valueAddress.FromCol + ix;
-                        addresses.Enqueue(new FormulaRangeAddress() { ExternalReferenceIx = extRef, WorksheetIx = wsIx, FromRow = r, ToRow = r, FromCol = c, ToCol = c });
+                        currentAddress = new FormulaRangeAddress() { ExternalReferenceIx = extRef, WorksheetIx = wsIx, FromRow = r, ToRow = r, FromCol = c, ToCol = c };
+                        addresses.Enqueue(currentAddress);
                     }
                     pIx = ix;
                 }

src/EPPlus/LoadFunctions/LoadFunctionBase.cs

@@ -87,12 +87,13 @@ internal ExcelRangeBase Load()
         {
             var nRows = PrintHeaders ? GetNumberOfRows() + 1 : GetNumberOfRows();
             var nCols = GetNumberOfColumns();
-            var values = new object[transpose ? nCols : nRows, transpose ? nRows : nCols];
-
-            //if(Range.Worksheet._values.Capacity < values.Length)
-            //{
-            //    Range.Worksheet._values.Capacity = values.Length;
-            //}
+            if (transpose)
+            {
+                var t = nRows;
+                nRows = nCols;
+                nCols = t;
+            }
+            var values = new object[nRows, nCols];
 
             LoadInternal(values, out Dictionary<int, FormulaCell> formulaCells, out Dictionary<int, string> columnFormats);
             var ws = Range.Worksheet;
@@ -122,7 +123,7 @@ internal ExcelRangeBase Load()
                 return null;
             }
 
-            var r = transpose ? ws.Cells[Range._fromRow, Range._fromCol, Range._fromRow + nCols - 1, Range._fromCol + nRows - 1] : ws.Cells[Range._fromRow, Range._fromCol, Range._fromRow + nRows - 1, Range._fromCol + nCols - 1];
+            var r = ws.Cells[Range._fromRow, Range._fromCol, Range._fromRow + nRows - 1, Range._fromCol + nCols - 1];
 
             if (TableStyle.HasValue)
             {

src/EPPlusTest/Issues/FormulaCalculationIssues.cs

@@ -942,6 +942,22 @@ public void s853()
             Assert.AreEqual(12273.13, sheet.Cells["AI61"].Value);
 			Assert.AreEqual(-472.69, sheet.Cells["AI70"].Value);
         }
+        [TestMethod]
+        public void s858()
+        {
+            using var p1 = OpenTemplatePackage("s858-1.xlsx");
+            var ws1 = p1.Workbook.Worksheets["Aico Data"];
+            ws1.Calculate();
+            var result1 = ws1.Cells["D55"].Value;
+            Assert.AreEqual(265509.38, result1);
+
+            using var p2 = OpenTemplatePackage("s858-2.xlsx");
+            var ws2 = p2.Workbook.Worksheets["Aico data"];
+            ws2.Calculate();
+            var result2 = ws2.Cells["E55"].Value;
+
+            Assert.AreEqual(12977661.57, result2);
+        }
     }
 }
 

src/EPPlusTest/Issues/PackageIssues.cs

@@ -117,6 +117,14 @@ public void i1808()
                 SaveAndCleanup(package);
             }
         }
-
+        [TestMethod]
+        public void i1231()
+        {
+            using (ExcelPackage package = OpenTemplatePackage("i1231.xlsx"))
+            {
+                var ws = package.Workbook.Worksheets[0];
+                SaveAndCleanup(package);
+            }
+        }
     }
 }

src/EPPlusTest/Issues/PictureIssues.cs

@@ -1,13 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OfficeOpenXml.Drawing;
-using OfficeOpenXml.Drawing.Chart;
-using System.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Xml.Linq;
 namespace EPPlusTest.Issues
 {
-	[TestClass]
+    [TestClass]
 	public class PictureIssues : TestBase
 
 	{