diff --git a/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/Excel/XLWorkbook_Load.cs index fab0c94..4021d7a 100644 --- a/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/Excel/XLWorkbook_Load.cs @@ -1229,18 +1229,19 @@ } else if (cell.DataType == CellValues.Date) { - if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text)) + if (cell.CellValue != null && !XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text)) xlCell._cellValue = Double.Parse(cell.CellValue.Text, XLHelper.NumberStyle, XLHelper.ParseCulture).ToInvariantString(); xlCell._dataType = XLCellValues.DateTime; } else if (cell.DataType == CellValues.Boolean) { - xlCell._cellValue = cell.CellValue.Text; + if (cell.CellValue != null) + xlCell._cellValue = cell.CellValue.Text; xlCell._dataType = XLCellValues.Boolean; } else if (cell.DataType == CellValues.Number) { - if (!XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text)) + if (cell.CellValue != null && !XLHelper.IsNullOrWhiteSpace(cell.CellValue.Text)) xlCell._cellValue = Double.Parse(cell.CellValue.Text, XLHelper.NumberStyle, XLHelper.ParseCulture).ToInvariantString(); if (s == null) diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj index 24429b8..3ea96f8 100644 --- a/ClosedXML_Tests/ClosedXML_Tests.csproj +++ b/ClosedXML_Tests/ClosedXML_Tests.csproj @@ -275,6 +275,7 @@ + diff --git a/ClosedXML_Tests/Excel/Loading/LoadingTests.cs b/ClosedXML_Tests/Excel/Loading/LoadingTests.cs index 14c588e..a932317 100644 --- a/ClosedXML_Tests/Excel/Loading/LoadingTests.cs +++ b/ClosedXML_Tests/Excel/Loading/LoadingTests.cs @@ -23,8 +23,10 @@ @"Misc\LoadPivotTables.xlsx", @"Misc\LoadFileWithCustomSheetViews.xlsx", @"Misc\LoadSheetsWithCommas.xlsx", + @"Misc\ExcelProducedWorkbookWithImages.xlsx", @"Misc\InvalidPrintTitles.xlsx", - @"Misc\ExcelProducedWorkbookWithImages.xlsx" + @"Misc\ExcelProducedWorkbookWithImages.xlsx", + @"Misc\EmptyCellValue.xlsx" }; foreach (var file in files) @@ -136,8 +138,8 @@ var ws2 = wb.Worksheets.Skip(1).First(); Assert.AreEqual(1, ws2.Pictures.Count); Assert.AreEqual(XLPicturePlacement.MoveAndSize, ws2.Pictures.First().Placement); - } -} + } + } [Test] public void CanLoadFileWithImagesWithCorrectImageType() diff --git a/ClosedXML_Tests/Resource/Misc/EmptyCellValue.xlsx b/ClosedXML_Tests/Resource/Misc/EmptyCellValue.xlsx new file mode 100644 index 0000000..f90b0fc --- /dev/null +++ b/ClosedXML_Tests/Resource/Misc/EmptyCellValue.xlsx Binary files differ