Merge pull request #412 from igitur/issue410-load-table-without-name

Fall back to display name if table name is missing.
ClosedXML · Aug 23, 2017 · dbc8307 · dbc8307
2 parents 46b92dc + f442fba
commit dbc8307
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/Excel/XLWorkbook_Load.cs
@@ -265,11 +265,15 @@ private void LoadSpreadsheetDocument(SpreadsheetDocument dSpreadsheet)
 
                 #region LoadTables
 
-                foreach (TableDefinitionPart tablePart in wsPart.TableDefinitionParts)
+                foreach (var tablePart in wsPart.TableDefinitionParts)
                 {
                     var dTable = tablePart.Table;
-                    string reference = dTable.Reference.Value;
-                    XLTable xlTable = ws.Range(reference).CreateTable(dTable.Name, false) as XLTable;
+                    String reference = dTable.Reference.Value;
+                    String tableName = dTable?.Name ?? dTable.DisplayName ?? string.Empty;
+                    if (String.IsNullOrWhiteSpace(tableName))
+                        throw new InvalidDataException("The table name is missing.");
+
+                    XLTable xlTable = ws.Range(reference).CreateTable(tableName, false) as XLTable;
                     if (dTable.HeaderRowCount != null && dTable.HeaderRowCount == 0)
                     {
                         xlTable._showHeaderRow = false;

diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -288,6 +288,7 @@
     <EmbeddedResource Include="Resource\Misc\EmptyCellValue.xlsx" />
     <EmbeddedResource Include="Resource\Misc\AllShapes.xlsx" />
     <EmbeddedResource Include="Resource\Misc\TableHeadersWithLineBreaks.xlsx" />
+    <EmbeddedResource Include="Resource\Misc\TableWithNameNull.xlsx" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resource\Images\ImageHandling.png" />

diff --git a/ClosedXML_Tests/Excel/Loading/LoadingTests.cs b/ClosedXML_Tests/Excel/Loading/LoadingTests.cs
@@ -28,7 +28,8 @@ public void CanSuccessfullyLoadFiles()
                 @"Misc\ExcelProducedWorkbookWithImages.xlsx",
                 @"Misc\EmptyCellValue.xlsx",
                 @"Misc\AllShapes.xlsx",
-                @"Misc\TableHeadersWithLineBreaks.xlsx"
+                @"Misc\TableHeadersWithLineBreaks.xlsx",
+                @"Misc\TableWithNameNull.xlsx"
             };
 
             foreach (var file in files)

diff --git a/ClosedXML_Tests/Resource/Misc/TableWithNameNull.xlsx b/ClosedXML_Tests/Resource/Misc/TableWithNameNull.xlsx