Merge branch 'master' into dev-pr

Author: rabanti-github

Changelog.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## v2.6.3 
+
+---
+Release Date: **26.04.2025**
+
+- Fixed a bug that prevented adding new worksheets when a pane split was defined
+- Changed handling of reading workbooks, when docProps are missing (formal change)
+- Added test case
+
+
 ## v2.6.2 
 
 ---

Demo/Demo.csproj

@@ -15,9 +15,9 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net45;net5.0</TargetFrameworks>
     <StartupObject>Demo.Program</StartupObject>
-    <Version>2.6.2</Version>
-    <AssemblyVersion>2.6.2.0</AssemblyVersion>
-    <FileVersion>2.6.2.0</FileVersion>
+    <Version>2.6.3</Version>
+    <AssemblyVersion>2.6.3.0</AssemblyVersion>
+    <FileVersion>2.6.3.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>XLSX Excel ExcelWriter ExcelReader Office</PackageTags>

NanoXLSX/LowLevel/MetadataReader.cs

@@ -69,17 +69,12 @@ public class MetadataReader
 
         #region methods
         /// <summary>
-        /// Reads the XML file form the passed stream and processes the AppData section
+        /// Reads the XML file form the passed stream and processes the AppData section. The existence of the stream should be checked previously
         /// </summary>
         /// <param name="stream">Stream of the XML file</param>
         /// <exception cref="Exceptions.IOException">Throws IOException in case of an error</exception>
         public void ReadAppData(MemoryStream stream)
         {
-            if (stream == null)
-            {
-                // No metadata available in xlsx file
-                return;
-            }
             try
             {
                 using (stream) // Close after processing
@@ -119,17 +114,12 @@ public void ReadAppData(MemoryStream stream)
         }
 
         /// <summary>
-        /// Reads the XML file form the passed stream and processes the Core section
+        /// Reads the XML file form the passed stream and processes the Core section. The existence of the stream should be checked previously
         /// </summary>
         /// <param name="stream">Stream of the XML file</param>
         /// <exception cref="Exceptions.IOException">Throws IOException in case of an error</exception>
         public void ReadCoreData(MemoryStream stream)
         {
-            if (stream == null)
-            {
-                // No metadata available in xlsx file
-                return;
-            }
             try
             {
                 using (stream) // Close after processing

NanoXLSX/LowLevel/XlsxReader.cs

@@ -338,9 +338,15 @@ private void ReadZip(ZipArchive zf)
 
             metadataReader = new MetadataReader();
             ms = GetEntryStream("docProps/app.xml", zf);
-            metadataReader.ReadAppData(ms);
+            if (ms != null && ms.Length > 0) // If null/length == 0, no docProps/app.xml seems to be defined 
+            {
+                metadataReader.ReadAppData(ms);
+            }
             ms = GetEntryStream("docProps/core.xml", zf);
-            metadataReader.ReadCoreData(ms);
+            if (ms != null && ms.Length > 0) // If null/length == 0, no docProps/core.xml seems to be defined 
+            {
+                metadataReader.ReadCoreData(ms);
+            }
 
             int worksheetIndex = 1;
             string name;

NanoXLSX/LowLevel/XlsxWriter.cs

@@ -213,7 +213,7 @@ private string CreateWorkbookDocument()
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">");
-            if (workbook.SelectedWorksheet > 0 || workbook.Hidden)
+            if (workbook.SelectedWorksheet > 0 || workbook.Hidden || workbook.Worksheets.Any(x => HasPaneSplitting(x)))
             {
                 sb.Append("<bookViews><workbookView ");
                 if (workbook.Hidden)

NanoXLSX/NanoXLSX.csproj

@@ -23,9 +23,9 @@
     <PackageLicenseFile></PackageLicenseFile>
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/NanoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>2.6.2</Version>
-    <AssemblyVersion>2.6.2.0</AssemblyVersion>
-    <FileVersion>2.6.2.0</FileVersion>
+    <Version>2.6.3</Version>
+    <AssemblyVersion>2.6.3.0</AssemblyVersion>
+    <FileVersion>2.6.3.0</FileVersion>
     <RepositoryType>git</RepositoryType>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>

NanoXlsx Test/NanoXLSX Test.csproj

@@ -17,9 +17,9 @@
     <PackageTags>Excel Office XLSX</PackageTags>
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/NanoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
-    <Version>2.6.2</Version>
-    <AssemblyVersion>2.6.2.0</AssemblyVersion>
-    <FileVersion>2.6.2.0</FileVersion>
+    <Version>2.6.3</Version>
+    <AssemblyVersion>2.6.3.0</AssemblyVersion>
+    <FileVersion>2.6.3.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Resources\autofilter.xlsx" />
@@ -35,6 +35,7 @@
     <None Remove="Resources\invalid_workbook.xlsx" />
 	<None Remove="Resources\invalid_workbook_sheet-definition.xlsx" />
     <None Remove="Resources\invalid_worksheet.xlsx" />
+    <None Remove="Resources\missing_DocProps.xlsx" />
     <None Remove="Resources\missing_worksheet.xlsx" />
     <None Remove="Resources\new_format.xlsx" />
     <None Remove="Resources\omitted_style_refs.xlsx" />
@@ -57,6 +58,7 @@
 	  <EmbeddedResource Include="Resources\invalid_workbook.xlsx" />
 	  <EmbeddedResource Include="Resources\invalid_workbook_sheet-definition.xlsx" />
 	  <EmbeddedResource Include="Resources\invalid_worksheet.xlsx" />
+	  <EmbeddedResource Include="Resources\missing_docProps.xlsx" />
 	  <EmbeddedResource Include="Resources\semi-large-amount.xlsx" />
 	  <EmbeddedResource Include="Resources\missing_worksheet.xlsx">
 	    <CopyToOutputDirectory>Never</CopyToOutputDirectory>

NanoXlsx Test/Reader/ReadDataTest.cs

@@ -405,6 +405,15 @@ public async Task FailingAsyncReadInvalidDataTest(string invalidFile)
             await Assert.ThrowsAsync<NanoXLSX.Exceptions.IOException>(() => Workbook.LoadAsync(stream));
         }
 
+        [Fact(DisplayName = "Test of the reader functionality on missing docProps documents (should not crash)")]
+        public void ReadMissingDocPropsTest()
+        {
+            Stream stream = TestUtils.GetResource("missing_docProps.xlsx");
+            Workbook workbook = Workbook.Load(stream);
+            Assert.Single(workbook.Worksheets);
+            Assert.NotNull(workbook.WorkbookMetadata);
+        }
+
         [Fact(DisplayName = "Test of the workbook reader if the only workbook entry is a chart")]
         public void ReadChartsheetTest()
         {