Update v2.11.4

Author: rabanti-github

Changelog.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v2.11.4
+
+---
+Release Date: **27.03.2022**
+
+- Fixed a follow-up issue on finding first/last cell addresses on explicitly defined, empty cells
+
 ## v2.11.3
 
 ---

Demo .NET Standard/Demo .NET Standard.csproj

@@ -8,9 +8,9 @@
     <Copyright>Copyright Raphael Stoeckli © 2022</Copyright>
     <RepositoryUrl>https://github.com/rabanti-github/PicoXLSX.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/rabanti-github/PicoXLSX</PackageProjectUrl>
-    <AssemblyVersion>2.11.3.0</AssemblyVersion>
-    <FileVersion>2.11.3.0</FileVersion>
-    <Version>2.11.3</Version>
+    <AssemblyVersion>2.11.4.0</AssemblyVersion>
+    <FileVersion>2.11.4.0</FileVersion>
+    <Version>2.11.4</Version>
     <Description>Demo Library showing the use of PicoXLSX, a library to generate Microsoft Excel files (XLSX) in an easy and native way</Description>
     <StartupObject>Demo.Program</StartupObject>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Demo/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.11.3.0")]
-[assembly: AssemblyFileVersion("2.11.3.0")]
+[assembly: AssemblyVersion("2.11.4.0")]
+[assembly: AssemblyFileVersion("2.11.4.0")]

Documentation/CodeDocumentation.shfbproj

@@ -41,7 +41,7 @@
     <VisibleItems>InheritedMembers, InheritedFrameworkMembers, Internals, Privates, Protected, SealedProtected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable</VisibleItems>
     <FeedbackEMailAddress>
     </FeedbackEMailAddress>
-    <CopyrightText>Copyright Raphael Stoeckli &amp;#169%3b 2021</CopyrightText>
+    <CopyrightText>Copyright Raphael Stoeckli &amp;#169%3b 2022</CopyrightText>
     <SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
     <WarnOnMissingSourceContext>False</WarnOnMissingSourceContext>
     <ProjectSummary>&amp;lt%3bp&amp;gt%3bPicoXLSX is a small .NET / C# library to create XLSX files %28Microsoft Excel 2007 or newer%29 in an easy and native way&amp;lt%3b/p&amp;gt%3b

PicoXLSX .NET Standard/PicoXLSX .NET Standard.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <RootNamespace>PicoXLSX</RootNamespace>
     <PackageId>PicoXLSX</PackageId>
-    <Version>2.11.3</Version>
+    <Version>2.11.4</Version>
     <Authors>Raphael Stoeckli</Authors>
     <Company>Raphael Stoeckli</Company>
     <Product>PicoXLSX</Product>
@@ -17,8 +17,8 @@
     <PackageTags>Excel Office XLSX</PackageTags>
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/PicoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>2.11.3.0</AssemblyVersion>
-    <FileVersion>2.11.3.0</FileVersion>
+    <AssemblyVersion>2.11.4.0</AssemblyVersion>
+    <FileVersion>2.11.4.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

PicoXLSX/LowLevel.cs

@@ -1632,7 +1632,7 @@ public static string GeneratePasswordHash(string password)
         /// <param name="date">Date to process</param>
         /// <returns>Date or date and time as number</returns>
         /// <exception cref="FormatException">Throws a FormatException if the passed date cannot be translated to the OADate format</exception>
-        /// <remarks>OAdate format starts at January 1st 1900 (actually 00.01.1900) and ends at December 31 9999. Values beyond these dates cannot be handled by Excel under normal circumstances and will throw a FormatException</remarks>
+        /// <remarks>OAdate format starts at January 1st 1900 (actually 00.01.1900) and ends at December 31 9999. Values after these dates cannot be handled by Excel under normal circumstances and will throw a FormatException</remarks>
         public static string GetOADateTimeString(DateTime date)
         {
             if (date < FIRST_ALLOWED_EXCEL_DATE || date > LAST_ALLOWED_EXCEL_DATE)

PicoXLSX/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.11.3")]
-[assembly: AssemblyFileVersion("2.11.3")]
+[assembly: AssemblyVersion("2.11.4")]
+[assembly: AssemblyFileVersion("2.11.4")]

PicoXLSX/Worksheet.cs

@@ -1093,8 +1093,8 @@ public void ResetColumn(int columnNumber)
         /// Gets the first existing column number in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based column number. In case of an empty worksheet, -1 will be returned</returns>
-        /// <remarks>GetLastColumnNumber() will not return the last column with data in any case. If there is a formated but empty cell (or many) before the first cell with data, 
-        /// GetLastColumnNumber() will return the column number of this empty cell. Use <see cref="GetFirstDataColumnNumber"/> in this case.</remarks>
+        /// <remarks>GetFirstColumnNumber() will not return the first column with data in any case. If there is a formatted but empty cell (or many) before the first cell with data, 
+        /// GetFirstColumnNumber() will return the column number of this empty cell. Use <see cref="GetFirstDataColumnNumber"/> in this case.</remarks>
         public int GetFirstColumnNumber()
         {
             return GetBoundaryNumber(false, true);
@@ -1108,14 +1108,14 @@ public int GetFirstColumnNumber()
         /// If you want the first defined column, use <see cref="GetFirstColumnNumber"/> instead.</remarks>
         public int GetFirstDataColumnNumber()
         {
-            return GetBoundaryDataNumber(false, true);
+            return GetBoundaryDataNumber(false, true, true);
         }
 
         /// <summary>
         /// Gets the first existing row number in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based row number. In case of an empty worksheet, -1 will be returned</returns>
-        /// <remarks>GetFirstRowNumber() will not return the first row with data in any case. If there is a formated but empty cell (or many) before the first cell with data, 
+        /// <remarks>GetFirstRowNumber() will not return the first row with data in any case. If there is a formatted but empty cell (or many) before the first cell with data, 
         /// GetFirstRowNumber() will return the row number of this empty cell. Use <see cref="GetFirstDataRowNumber"/> in this case.</remarks>
         public int GetFirstRowNumber()
         {
@@ -1126,19 +1126,19 @@ public int GetFirstRowNumber()
         /// Gets the first existing row number with data in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based row number. In case of an empty worksheet, -1 will be returned</returns>
-        /// <remarks>GetFirstDataColumnNumber() will ignore formatted but empty cells before the first column with data. 
-        /// If you want the first defined column, use <see cref="GetFirstColumnNumber"/> instead.</remarks>
+        /// <remarks>GetFirstDataRowNumber() will ignore formatted but empty cells before the first row with data. 
+        /// If you want the first defined row, use <see cref="GetFirstRowNumber"/> instead.</remarks>
         public int GetFirstDataRowNumber()
         {
-            return GetBoundaryDataNumber(true, true);
+            return GetBoundaryDataNumber(true, true, true);
         }
 
         /// <summary>
         /// Gets the last existing column number in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based column number. In case of an empty worksheet, -1 will be returned</returns>
         /// <remarks>GetLastColumnNumber() will not return the last column with data in any case. If there is a formatted (or with the definition of AutoFilter, 
-        /// column width or hidden state) but empty cell (or many) beyond the last cell with data, 
+        /// column width or hidden state) but empty cell (or many) after the last cell with data, 
         /// GetLastColumnNumber() will return the column number of this empty cell. Use <see cref="GetLastDataColumnNumber"/> in this case.</remarks>
         public int GetLastColumnNumber()
         {
@@ -1149,19 +1149,19 @@ public int GetLastColumnNumber()
         /// Gets the last existing column number with data in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based column number. in case of an empty worksheet, -1 will be returned</returns>
-        /// <remarks>GetLastDataColumnNumber() will ignore formatted (or with the definition of AutoFilter, column width or hidden state) but empty cells beyond the last column with data. 
+        /// <remarks>GetLastDataColumnNumber() will ignore formatted (or with the definition of AutoFilter, column width or hidden state) but empty cells after the last column with data. 
         /// If you want the last defined column, use <see cref="GetLastColumnNumber"/> instead.</remarks>
         public int GetLastDataColumnNumber()
         {
-            return GetBoundaryDataNumber(false, false);
+            return GetBoundaryDataNumber(false, false, true);
         }
 
         /// <summary>
         /// Gets the last existing row number in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based row number. In case of an empty worksheet, -1 will be returned</returns>
         /// <remarks>GetLastRowNumber() will not return the last row with data in any case. If there is a formatted (or with the definition of row height or hidden state) 
-        /// but empty cell (or many) beyond the last cell with data, 
+        /// but empty cell (or many) after the last cell with data, 
         /// GetLastRowNumber() will return the row number of this empty cell. Use <see cref="GetLastDataRowNumber"/> in this case.</remarks>
         public int GetLastRowNumber()
         {
@@ -1173,19 +1173,19 @@ public int GetLastRowNumber()
         /// Gets the last existing row number with data in the current worksheet (zero-based)
         /// </summary>
         /// <returns>Zero-based row number. in case of an empty worksheet, -1 will be returned</returns>
-        /// <remarks>GetLastDataColumnNumber() will ignore formatted (or with the definition of row height or hidden state) but empty cells beyond the last column with data. 
+        /// <remarks>GetLastDataColumnNumber() will ignore formatted (or with the definition of row height or hidden state) but empty cells after the last column with data. 
         /// If you want the last defined column, use <see cref="GetLastRowNumber"/> instead.</remarks>
         public int GetLastDataRowNumber()
         {
-            return GetBoundaryDataNumber(true, false);
+            return GetBoundaryDataNumber(true, false, true);
         }
 
         /// <summary>
         ///  Gets the last existing cell in the current worksheet (bottom right)
         /// </summary>
         /// <returns>Nullable Cell Address. If no cell address could be determined, null will be returned</returns>
         /// <remarks>GetLastCellAddress() will not return the last cell with data in any case. If there is a formatted (or with definitions of hidden states, AutoFilters, heights or widths) 
-        /// but empty cell (or many) beyond the last cell with data, 
+        /// but empty cell (or many) after the last cell with data, 
         /// GetLastCellAddress() will return the address of this empty cell. Use <see cref="GetLastDataCellAddress"/> in this case.</remarks>
 
         public Cell.Address? GetLastCellAddress()
@@ -1203,7 +1203,7 @@ public int GetLastDataRowNumber()
         ///  Gets the last existing cell with data in the current worksheet (bottom right)
         /// </summary>
         /// <returns>Nullable Cell Address. If no cell address could be determined, null will be returned</returns>
-        /// <remarks>GetLastDataCellAddress() will ignore formatted (or with definitions of hidden states, AutoFilters, heights or widths) but empty cells beyond the last cell with data. 
+        /// <remarks>GetLastDataCellAddress() will ignore formatted (or with definitions of hidden states, AutoFilters, heights or widths) but empty cells after the last cell with data. 
         /// If you want the last defined cell, use <see cref="GetLastCellAddress"/> instead.</remarks>
 
         public Cell.Address? GetLastDataCellAddress()
@@ -1221,7 +1221,7 @@ public int GetLastDataRowNumber()
         ///  Gets the first existing cell in the current worksheet (bottom right)
         /// </summary>
         /// <returns>Nullable Cell Address. If no cell address could be determined, null will be returned</returns>
-        /// <remarks>GetFirstCellAddress() will not return the first cell with data in any case. If there is a formated but empty cell (or many) before the first cell with data, 
+        /// <remarks>GetFirstCellAddress() will not return the first cell with data in any case. If there is a formatted but empty cell (or many) before the first cell with data, 
         /// GetLastCellAddress() will return the address of this empty cell. Use <see cref="GetFirstDataCellAddress"/> in this case.</remarks>
         public Cell.Address? GetFirstCellAddress()
         {
@@ -1256,37 +1256,54 @@ public int GetLastDataRowNumber()
         /// </summary>
         /// <param name="row">If true, the min or max row is returned, otherwise the column</param>
         /// <param name="min">If true, the min value of the row or column is defined, otherwise the max value</param>
+        /// <param name="ignoreEmpty">If true, empty cell values are ignored, otherwise considered without checking the content</param>
         /// <returns>Min or max number, or -1 if not defined</returns>
-        private int GetBoundaryDataNumber(bool row, bool min)
+        private int GetBoundaryDataNumber(bool row, bool min, bool ignoreEmpty)
         {
             if (cells.Count == 0)
             {
                 return -1;
             }
-            else
+            if (!ignoreEmpty)
             {
-                List<Cell> nonEmptyCells = cells.Values.Where(x => x.Value != null).ToList();
-                if (nonEmptyCells.Count == 0)
-                {
-                    return -1;
-                }
                 if (row && min)
                 {
-                    return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.RowNumber);
+                    return cells.Min(x => x.Value.RowNumber);
                 }
                 else if (row)
                 {
-                    return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.RowNumber);
+                    return cells.Max(x => x.Value.RowNumber);
                 }
                 else if (min)
                 {
-                    return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.ColumnNumber);
+                    return cells.Min(x => x.Value.ColumnNumber);
                 }
                 else
                 {
-                    return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.ColumnNumber);
+                    return cells.Max(x => x.Value.ColumnNumber);
                 }
             }
+            List<Cell> nonEmptyCells = cells.Values.Where(x => x.Value != null).ToList();
+            if (nonEmptyCells.Count == 0)
+            {
+                return -1;
+            }
+            if (row && min)
+            {
+                return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.RowNumber);
+            }
+            else if (row)
+            {
+                return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.RowNumber);
+            }
+            else if (min)
+            {
+                return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.ColumnNumber);
+            }
+            else
+            {
+                return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.ColumnNumber);
+            }
         }
 
         /// <summary>
@@ -1297,7 +1314,7 @@ private int GetBoundaryDataNumber(bool row, bool min)
         /// <returns>Min or max number, or -1 if not defined</returns>
         private int GetBoundaryNumber(bool row, bool min)
         {
-            int cellBoundary = GetBoundaryDataNumber(row, min);
+            int cellBoundary = GetBoundaryDataNumber(row, min, false);
             if (row)
             {
                 int heightBoundary = -1;