Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
rabanti-github committed Oct 25, 2024
2 parents 2acc9be + 762f69f commit c3039d7
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## v3.3.1

---
Release Date: **26.10.2024**
- Fixed a bug regarding the determination of the first data cell in an empty worksheet. Bug fix provided by Martin Stránský in NanoXLSX

## v3.3.0

---
Expand Down
6 changes: 3 additions & 3 deletions Demo .NET Standard/Demo .NET Standard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Copyright>Copyright Raphael Stoeckli © 2024</Copyright>
<RepositoryUrl>https://github.com/rabanti-github/PicoXLSX.git</RepositoryUrl>
<PackageProjectUrl>https://github.com/rabanti-github/PicoXLSX</PackageProjectUrl>
<AssemblyVersion>3.3.0.0</AssemblyVersion>
<FileVersion>3.2.0.0</FileVersion>
<Version>3.3.0</Version>
<AssemblyVersion>3.3.1.0</AssemblyVersion>
<FileVersion>3.3.1.0</FileVersion>
<Version>3.3.1</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>
Expand Down
4 changes: 2 additions & 2 deletions Demo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("3.3.0.0")]
[assembly: AssemblyFileVersion("3.3.0.0")]
[assembly: AssemblyVersion("3.3.1.0")]
[assembly: AssemblyFileVersion("3.3.1.0")]
6 changes: 3 additions & 3 deletions PicoXLSX .NET Standard/PicoXLSX .NET Standard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<RootNamespace>PicoXLSX</RootNamespace>
<PackageId>PicoXLSX</PackageId>
<Version>3.3.0</Version>
<Version>3.3.1</Version>
<Authors>Raphael Stoeckli</Authors>
<Company></Company>
<Product>PicoXLSX</Product>
Expand All @@ -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>3.3.0.0</AssemblyVersion>
<FileVersion>3.3.0.0</FileVersion>
<AssemblyVersion>3.3.1.0</AssemblyVersion>
<FileVersion>3.3.1.0</FileVersion>
<AssemblyName>PicoXLSX</AssemblyName>
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions PicoXLSX/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("3.3.0")]
[assembly: AssemblyFileVersion("3.3.0")]
[assembly: AssemblyVersion("3.3.1")]
[assembly: AssemblyFileVersion("3.3.1")]
10 changes: 5 additions & 5 deletions PicoXLSX/Worksheet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1386,26 +1386,26 @@ private int GetBoundaryDataNumber(bool row, bool min, bool ignoreEmpty)
return cells.Max(x => x.Value.ColumnNumber);
}
}
List<Cell> nonEmptyCells = cells.Values.Where(x => x.Value != null).ToList();
List<Cell> nonEmptyCells = cells.Values.Where(x => x.Value != null && x.Value.ToString() != string.Empty).ToList();
if (nonEmptyCells.Count == 0)
{
return -1;
}
if (row && min)
{
return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.RowNumber);
return nonEmptyCells.Min(x => x.RowNumber);
}
else if (row)
{
return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.RowNumber);
return nonEmptyCells.Max(x => x.RowNumber);
}
else if (min)
{
return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Min(x => x.ColumnNumber);
return nonEmptyCells.Min(x => x.ColumnNumber);
}
else
{
return nonEmptyCells.Where(x => x.Value.ToString() != string.Empty).Max(x => x.ColumnNumber);
return nonEmptyCells.Max(x => x.ColumnNumber);
}
}

Expand Down

0 comments on commit c3039d7

Please sign in to comment.