Merge pull request #1171 from EPPlusSoftware/bug/issue1177

Fixed issue #1177

Author: OssianEPPlus

src/EPPlus/EPPlus.csproj

@@ -445,8 +445,12 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
     <DefineConstants>Core;NET70</DefineConstants>
   </PropertyGroup>
-	
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net462'">
+
+   <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+	<DefineConstants>Core;NET80</DefineConstants>
+   </PropertyGroup>
+
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net462'">
     <DefineConstants>NET45;NETFULL</DefineConstants>
   </PropertyGroup>
 
@@ -551,8 +555,20 @@
 	  </PackageReference>
   </ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="System.ComponentModel.Annotations">
+			<Version>5.0.0</Version>
+		</PackageReference>
+		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream">
+			<Version>2.3.2</Version>
+		</PackageReference>
+	</ItemGroup>
+
 
- <ItemGroup>
+	<ItemGroup>
     <None Remove="resources\DefaultTableStyles.cst" />
     <None Remove="resources\fontsize.zip" />
     <None Remove="resources\TextMetrics.zip" />

src/EPPlus/ExternalReferences/ExcelExternalWorkbook.cs

@@ -144,6 +144,7 @@ private void ReadSheetData(XmlTextReader reader, ExcelWorkbook wb)
 
             int row=0, col=0;
             string type="";
+            if (reader.IsEmptyElement) return;
             while (reader.Read())
             {
                 if (reader.NodeType == XmlNodeType.EndElement && reader.Name == "sheetData")

src/EPPlus/FormulaParsing/Excel/Functions/FunctionArgument.cs

@@ -123,7 +123,7 @@ public IRangeInfo ValueAsRangeInfo
                 {
                     if(_result.Address!=null)
                     {
-                        return new RangeInfo(_result.Address);
+                        return _result.Address.GetAsRangeInfo();
                     }
                     return null;
                 }

src/EPPlus/FormulaParsing/FormulaExpressions/CompileResult.cs

@@ -227,7 +227,7 @@ public object ResultValue
                 if(DataType==DataType.ExcelRange)
                 {
                     var r = Result as IRangeInfo;
-                    if (r == null || r.IsMulti)
+                    if (r == null || r.GetNCells()>1)
                     {
                         return Result;
                     }

src/EPPlus/FormulaParsing/FormulaExpressions/FunctionCompilers/CustomArrayBehaviourCompiler.cs

@@ -50,7 +50,7 @@ public override CompileResult Compile(IEnumerable<CompileResult> children, Parsi
                 if(cr.DataType == DataType.ExcelRange && Function.ArrayBehaviourConfig.CanBeArrayArg(ix))
                 {
                     var range = cr.Result as IRangeInfo;
-                    if(range.IsMulti)
+                    if(range.GetNCells() > 1)
                     {
                         rangeArgs[ix] = range;
                     }

src/EPPlus/FormulaParsing/FormulaExpressions/RangeExpression.cs

@@ -54,19 +54,8 @@ public override CompileResult Compile()
                 }
                 else
                 {
-                    var wb = Context.GetExternalWoorkbook(_addressInfo.ExternalReferenceIx);
-                    IRangeInfo ri;
-                    if(wb?.Package!=null)
-                    {
-                        var ws = wb?.Package.Workbook.GetWorksheetByIndexInList(_addressInfo.WorksheetIx);
-                        ri=new RangeInfo(ws, _addressInfo.FromRow, _addressInfo.FromCol, _addressInfo.ToRow, _addressInfo.ToCol, Context);
-                    }
-                    else
-                    {
-                        ri = new EpplusExcelExternalRangeInfo(wb, _addressInfo, Context);
-                    }
-
-                    if (ri.IsMulti)
+                    var ri = _addressInfo.GetAsRangeInfo();
+                    if (ri.GetNCells()>1)
                     {
                         _cachedCompileResult = new AddressCompileResult(ri, DataType.ExcelRange, _addressInfo);
                     }

src/EPPlus/FormulaParsing/FormulaExpressions/TableAddressExpression.cs

@@ -24,7 +24,7 @@ public override CompileResult Compile()
             }
 
             var ri = Context.ExcelDataProvider.GetRange(_addressInfo);
-            if (ri.IsMulti)
+            if (ri.GetNCells() > 1)
             {
                 return new AddressCompileResult(ri, DataType.ExcelRange, _addressInfo);
             }

src/EPPlus/FormulaParsing/IRangeInfo.cs

@@ -29,7 +29,7 @@ public interface IRangeInfo : IAddressInfo, IEnumerator<ICellInfo>, IEnumerable<
         /// </summary>
         bool IsEmpty { get; }
         /// <summary>
-        /// If the contains more than one cell  with a value.
+        /// If the range contains more than one cell with a value.
         /// </summary>
         bool IsMulti { get; }
         /// <summary>

src/EPPlus/FormulaParsing/LexicalAnalysis/FormulaAddress.cs

@@ -12,6 +12,7 @@
 using System.Linq;
 using OfficeOpenXml.Utils;
 using System.Net;
+using OfficeOpenXml.FormulaParsing.Ranges;
 
 namespace OfficeOpenXml.FormulaParsing.LexicalAnalysis
 {
@@ -833,6 +834,36 @@ internal ulong GetTopLeftCellId()
             return ExcelCellBase.GetCellId(WorksheetIx, FromRow, FromCol);
         }
 
+        internal IRangeInfo GetAsRangeInfo()
+        {
+            if(ExternalReferenceIx>0)
+            {
+                return GetAsExternalRangeInfo();
+            }
+            else
+            {
+                return new RangeInfo(this);
+            }
+        }
+
+        internal IRangeInfo GetAsExternalRangeInfo()
+        {
+            var wb = _context.GetExternalWoorkbook(ExternalReferenceIx);
+            if(wb==null)
+            {
+                return new RangeInfo(null, -1, -1, -1, -1, _context, ExternalReferenceIx);
+            }
+            else if (wb.Package == null)
+            {
+                return new EpplusExcelExternalRangeInfo(wb, this, _context);
+            }
+            else
+            {
+                var ws = wb.Package.Workbook.GetWorksheetByIndexInList(WorksheetIx);
+                return new RangeInfo(ws, FromRow, FromCol, ToRow, ToCol, _context);
+            }
+        }
+
         public FormulaRangeAddress Address => this;
     }
     public class FormulaTableAddress : FormulaRangeAddress
@@ -904,11 +935,6 @@ internal void SetTableAddress(ExcelPackage package)
             {
                 FixedFlag = FixedFlag.All;
 
-                FromRow = table.ShowHeader ? table.Address._fromRow + 1 : table.Address._fromRow;
-                ToRow = table.ShowTotal ? table.Address._toRow - 1 : table.Address._toRow;
-                FromCol = table.Address._fromCol;
-                ToCol = table.Address._toCol;
-
                 if (string.IsNullOrEmpty(TablePart1) == false)
                 {
                     SetRowFromTablePart(TablePart1, table, ref FromRow, ref ToRow, ref FixedFlag);
@@ -917,6 +943,11 @@ internal void SetTableAddress(ExcelPackage package)
                         SetRowFromTablePart(TablePart2, table, ref FromRow, ref ToRow, ref FixedFlag);
                     }
                 }
+                else
+                {
+                    FromRow = table.ShowHeader ? table.Address._fromRow + 1 : table.Address._fromRow;
+                    ToRow = table.ShowTotal ? table.Address._toRow - 1 : table.Address._toRow;
+                }
 
                 if (string.IsNullOrEmpty(ColumnName1) == false)
                 {
@@ -926,6 +957,11 @@ internal void SetTableAddress(ExcelPackage package)
                         SetColFromTablePart(ColumnName2, table, ref FromCol, ref ToCol, true);
                     }
                 }
+                else
+                {
+                    FromCol = table.Address._fromCol;
+                    ToCol = table.Address._toCol;
+                }
             }
         }
         private void SetColFromTablePart(string value, ExcelTable table, ref int fromCol, ref int toCol, bool lastColon)

src/EPPlus/FormulaParsing/ParsingContext.cs

@@ -145,17 +145,14 @@ internal ExcelExternalWorkbook GetExternalWoorkbook(int externalReferenceIx)
         }
 
         internal HashSet<ulong> SubtotalAddresses { get; private set; }
-        internal FormulaCellAddress CurrentCell { get; set; }
-        internal FormulaCellAddress CurrentName { get; set; }
-        internal string CurrentCellFullAddress 
-        { 
-            get
-            {
-                var ws = CurrentCell.WorksheetIx < 0 || CurrentCell.WorksheetIx>=Package.Workbook.Worksheets.Count ? "" : Package.Workbook.Worksheets[CurrentCell.WorksheetIx].Name+"!";
-                return ws + CurrentCell.Address;
-            }
-        }
-        internal ExcelWorksheet CurrentWorksheet 
+        /// <summary>
+        /// Represents the current cell 
+        /// </summary>
+        public FormulaCellAddress CurrentCell { get; set; }
+        /// <summary>
+        /// The worksheet where the current formula is located.
+        /// </summary>
+        public ExcelWorksheet CurrentWorksheet 
         { 
             get
             {

src/EPPlus/FormulaParsing/Ranges/EpplusExcelExternalRangeInfo.cs

@@ -102,6 +102,8 @@ public EpplusExcelExternalRangeInfo(ExcelExternalWorkbook externalWb, FormulaRan
                 }
             }
         }
+
+
         /// <summary>
         /// Get the number of cells in the range
         /// </summary>
@@ -190,7 +192,7 @@ public ICellInfo Current
             get { return _cell; }
         }
         /// <summary>
-        /// Not applicable for external ranges.. Returns null
+        /// Not applicable for external ranges. Returns null
         /// </summary>
         public ExcelWorksheet Worksheet
         {

src/EPPlus/FormulaParsing/Ranges/RangeInfo.cs

@@ -117,7 +117,7 @@ public int GetNCells()
         }
 
         /// <summary>
-        /// Returns true if the range represents a reference
+        /// Returns true if the range represents an invalid reference
         /// </summary>
         public bool IsRef
         {

src/EPPlusTest/Issues.cs

@@ -5830,5 +5830,16 @@ public void s554()
                 SaveAndCleanup(package);
             }
         }
+        [TestMethod]
+        public void s551()
+        {
+            using (var p = OpenTemplatePackage("s551.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                ws.Cells["AA2"].Calculate();
+
+                Assert.AreEqual(3535399.86606, ws.Cells["AA2"].Value);
+            }
+        }
     }
 }