Fix for issue #2341

Author: JanKallman

src/EPPlus/FormulaParsing/DependencyChain/RpnFormulaExecution.cs

@@ -1198,7 +1198,7 @@ private static FormulaRangeAddress[] ExecuteNextToken(RpnOptimizedDependencyChai
                                 f.LambdaSettings.LambdaArgsAdded.Push(++nLambdaArgsAdded);
                             }
                         }
-                        if (localReturnAddress && returnAddresses && (f._funcStack.Count == 0 || ShouldIgnoreAddress(f._funcStack.Peek()) == false) && IsInRecalculateDirtyCells == false)
+                        if (localReturnAddress && returnAddresses && (f._funcStack.Count == 0 || ShouldIgnoreAddress(f._funcStack.Peek()) == false))
                         {
                             if(f._tokenIndex + 1 < f._tokens.Count)
                             {
@@ -1226,12 +1226,12 @@ private static FormulaRangeAddress[] ExecuteNextToken(RpnOptimizedDependencyChai
                             var nameAddress = ne.GetAddress();
                             if (nameAddress == null)
                             {
-                                if (returnAddresses && string.IsNullOrEmpty(ne._name?.Formula) == false && IsInRecalculateDirtyCells == false)
+                                if (returnAddresses && string.IsNullOrEmpty(ne._name?.Formula) == false)
                                 {
                                     return null;
                                 }
                             }
-                            else if (returnAddresses && (f._funcStack.Count == 0 || ShouldIgnoreAddress(f._funcStack.Peek()) == false) && IsInRecalculateDirtyCells == false)
+                            else if (returnAddresses && (f._funcStack.Count == 0 || ShouldIgnoreAddress(f._funcStack.Peek()) == false))
                             {
                                 if (IsSingleAddress(f))
                                 {

src/EPPlusTest/Issues/FormulaCalculationIssues.cs

@@ -1543,6 +1543,18 @@ public void s1029()
             Assert.AreEqual(6D, ws.Cells["A34"].Value);
             SaveAndCleanup(p);
         }
+        [TestMethod]
+        public void s1042()
+        {
+            using var p = OpenTemplatePackage("s1042.xlsx");
+            var wb = p.Workbook;
+            var ws = wb.Worksheets["Aico data"];
+            wb.Calculate();
+            Assert.AreEqual(2116735.05, ws.Cells["D45"].Value);
+            Assert.AreEqual(-27679.13, ws.Cells["D46"].Value);
+            Assert.AreEqual(27679.13, ws.Cells["D47"].Value);
+            //SaveAndCleanup(p);
+        }
     }
 }