From 9c5e247d7ea6a53fe6686f5befc91d516814d732 Mon Sep 17 00:00:00 2001 From: Pedro Rossato Date: Thu, 12 Nov 2026 16:27:49 -0300 Subject: [PATCH] Apply date and time number formats only to numeric cells Text cells (t="s", "str" and "inlineStr") with a date or time number format were converted to DateTime/TimeSpan whenever their text parsed as a double, with a result that depended on the current culture. Excel never applies a number format to text. ConvertCellValue yields a double only for numeric cells, so ConvertValueByStyleFormat now returns any other value unchanged and converts the double directly instead of round-tripping it through ToString and double.TryParse. Fixes #1041 --- src/MiniExcel.OpenXml/Styles/OpenXmlStyles.cs | 9 ++-- .../Issues/MiniExcelGithubIssuesTests.cs | 50 +++++++++++++++++++ .../Utils/SheetHelper.cs | 15 ++++++ 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/MiniExcel.OpenXml/Styles/OpenXmlStyles.cs b/src/MiniExcel.OpenXml/Styles/OpenXmlStyles.cs index 29bf6aa1..342bb200 100644 --- a/src/MiniExcel.OpenXml/Styles/OpenXmlStyles.cs +++ b/src/MiniExcel.OpenXml/Styles/OpenXmlStyles.cs @@ -180,15 +180,18 @@ internal static async Task CreateAsync(OpenXmlZip zip, Cancellati public object? ConvertValueByStyleFormat(int index, object? value) { + if (value is not double number) + return value; + var sf = GetStyleFormat(index); if (sf?.Type is null) return value; - if (sf.Type == typeof(DateTime?) && double.TryParse(value?.ToString(), out var s)) - return DateTimeHelper.IsValidOADateTime(s) ? DateTime.FromOADate(s) : value; + if (sf.Type == typeof(DateTime?)) + return DateTimeHelper.IsValidOADateTime(number) ? DateTime.FromOADate(number) : value; - if (sf.Type == typeof(TimeSpan?) && double.TryParse(value?.ToString(), out var number)) + if (sf.Type == typeof(TimeSpan?)) return TimeSpan.FromDays(number); return value; diff --git a/tests/MiniExcel.OpenXml.Tests/Issues/MiniExcelGithubIssuesTests.cs b/tests/MiniExcel.OpenXml.Tests/Issues/MiniExcelGithubIssuesTests.cs index 7eb559ac..3523b265 100644 --- a/tests/MiniExcel.OpenXml.Tests/Issues/MiniExcelGithubIssuesTests.cs +++ b/tests/MiniExcel.OpenXml.Tests/Issues/MiniExcelGithubIssuesTests.cs @@ -3317,4 +3317,54 @@ public void QueryReadsBuiltInDateFormatsAsDateTime(int numFmtId) Assert.Equal(new DateTime(2026, 11, 1), (object)row.A); } + + // https://github.com/mini-software/MiniExcel/issues/1041 + [Fact] + public void QueryReturnsTextCellsWithDateOrTimeFormatAsString() + { + using var path = AutoDeletingPath.Create(); + _excelExporter.Export(path.FilePath, new[] { new { Value = "control" } }); + SheetHelper.ReplaceStylesXml(path.FilePath, """ + + + + + + + + + """); + SheetHelper.ReplaceSharedStringsXml(path.FilePath, """ + + + 6200 + 0.5 + + """); + SheetHelper.ReplaceFirstSheetXml(path.FilePath, """ + + + + + + 46327 + 0 + 6200 + 6200 + 0.5 + 1 + + + + """); + + var row = _excelImporter.Query(path.FilePath).Single(); + + Assert.Equal(new DateTime(2026, 11, 1), (object)row.A); + Assert.Equal("6200", (object)row.B); + Assert.Equal("6200", (object)row.C); + Assert.Equal("6200", (object)row.D); + Assert.Equal(TimeSpan.FromHours(12), (object)row.E); + Assert.Equal("0.5", (object)row.F); + } } diff --git a/tests/MiniExcel.OpenXml.Tests/Utils/SheetHelper.cs b/tests/MiniExcel.OpenXml.Tests/Utils/SheetHelper.cs index 28c77c21..f7359458 100644 --- a/tests/MiniExcel.OpenXml.Tests/Utils/SheetHelper.cs +++ b/tests/MiniExcel.OpenXml.Tests/Utils/SheetHelper.cs @@ -103,6 +103,21 @@ internal static void ReplaceStylesXml(string path, string stylesXml) writer.Write(stylesXml); } + internal static void ReplaceSharedStringsXml(string path, string sharedStringsXml) + { + using var stream = File.Open(path, FileMode.Open, FileAccess.ReadWrite); + using var archive = new ZipArchive(stream, ZipArchiveMode.Update, false, Encoding.UTF8); + var sharedStrings = archive.Entries.Single(w => + w.FullName.Equals("xl/sharedStrings.xml", StringComparison.OrdinalIgnoreCase) || + w.FullName.Equals("/xl/sharedStrings.xml", StringComparison.OrdinalIgnoreCase)); + var entryName = sharedStrings.FullName; + sharedStrings.Delete(); + + var replacement = archive.CreateEntry(entryName); + using var writer = new StreamWriter(replacement.Open(), new UTF8Encoding(false)); + writer.Write(sharedStringsXml); + } + internal static string? GetFirstSheetDimensionRefValue(string path) { var ns = new XmlNamespaceManager(new NameTable());