Merge pull request #1383 from EPPlusSoftware/bug/issue1382

Fixes issue 1382

Author: OssianEPPlus

src/EPPlus/ExcelAddressBase.cs

@@ -1136,7 +1136,7 @@ internal ExcelAddressBase DeleteRow(int row, int rows, bool setFixed = false, bo
             else if (row+rows < _fromRow || (_fromRowFixed && row < _fromRow)) //Before
             {
                 var toRow = ((setFixed && _toRowFixed) || (adjustMaxRow==false && _toRow==ExcelPackage.MaxRows)) ? _toRow : _toRow - rows;
-                return new ExcelAddressBase((setFixed && _fromRowFixed ? _fromRow : _fromRow - rows), _fromCol, toRow, _toCol, _fromRowFixed, _fromColFixed, _toRowFixed, _toColFixed, WorkSheetName, _address);
+                return new ExcelAddressBase((setFixed && _fromRowFixed ? _fromRow : Math.Max(row, _fromRow - rows)), _fromCol, toRow, _toCol, _fromRowFixed, _fromColFixed, _toRowFixed, _toColFixed, WorkSheetName, _address);
             }
             else  //Partly
             {

src/EPPlus/ExcelCellBase.cs

@@ -1012,7 +1012,6 @@ internal static string UpdateFormulaReferences(string formula, int rowIncrement,
                     tokens = SourceCodeTokenizer.Default.Tokenize(formula);
                 }
                 var f = "";
-                //string wsName = "";
                 for(int i=0;i<tokens.Count;i++) 
                 {
                     var t = tokens[i];
@@ -1093,16 +1092,8 @@ internal static string UpdateFormulaReferences(string formula, int rowIncrement,
                             f += "#REF!";
                         }
                         else
-                        {
-                            var ix = address.Address.LastIndexOf('!');
-                            if (ix > 0)
-                            {
-                                f += address.Address.Substring(ix + 1);
-                            }
-                            else
-                            {
-                                f += address.Address;
-                            }
+                        {                            
+                            f += address.LocalAddress;
                         }
 
 

src/EPPlusTest/Core/Range/Delete/RangeDeleteTests.cs

@@ -1526,11 +1526,11 @@ public void DeleteRowValidateArrayFormula()
 		{
 			using var package = new ExcelPackage();
 			var sheet = package.Workbook.Worksheets.Add("Sheet 1");
-			sheet.Cells["A2"].Formula = "XLOOKUP($A$3,$B:$B,!$C:$C)";
+			sheet.Cells["A2"].Formula = "XLOOKUP($A$3,$B:$B,$C:$C)";
             sheet.Calculate();
             sheet.DeleteRow(1);
 
-            Assert.AreEqual("XLOOKUP($A$2,$B:$B,!$C:$C)", sheet.Cells["A1"].Formula);
+            Assert.AreEqual("XLOOKUP($A$2,$B:$B,$C:$C)", sheet.Cells["A1"].Formula);
 		}
 
 	}

src/EPPlusTest/Issues/WorksheetIssues.cs

@@ -303,7 +303,17 @@ public void s640()
 				SaveAndCleanup(package);
 			}
 		}
-    
+		[TestMethod]
+		public void s640_2()
+		{
+			using (var package = OpenTemplatePackage("s640-2.xlsx"))
+			{
+				var sheet = package.Workbook.Worksheets.First();
+				sheet.DeleteRow(6, 8);
+				SaveAndCleanup(package);
+			}
+		}
+
 		[TestMethod]
 		public void s641()
 		{