From 6f31824f59e83526b309e2c4f03351e22450c837 Mon Sep 17 00:00:00 2001
From: 89287 <89287@DESKTOP-29TD2HB>
Date: Thu, 22 Aug 2024 21:54:00 +0800
Subject: [PATCH 1/2] fix: update \r ASCII/UTF
---
ooxml/XSSF/Streaming/SheetDataWriter.cs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ooxml/XSSF/Streaming/SheetDataWriter.cs b/ooxml/XSSF/Streaming/SheetDataWriter.cs
index c2d9a511d..69a0b63e9 100644
--- a/ooxml/XSSF/Streaming/SheetDataWriter.cs
+++ b/ooxml/XSSF/Streaming/SheetDataWriter.cs
@@ -471,12 +471,19 @@ protected void OutputQuotedString(string s)
break;
// Special characters
case '\n':
+ if(counter > last)
+ {
+ WriteAsBytes(GetSubArray(chars, last, counter - last));
+ }
+ WriteAsBytes("
");
+ last = counter + 1;
+ break;
case '\r':
if (counter > last)
{
WriteAsBytes(GetSubArray(chars, last, counter - last));
}
- WriteAsBytes("
");
+ WriteAsBytes("
");
last = counter + 1;
break;
case '\t':
From 690af3919f2e6f0b9e2c7791100f3b4a649c2e35 Mon Sep 17 00:00:00 2001
From: Jero <892878525@qq.com>
Date: Tue, 27 Aug 2024 15:03:20 +0800
Subject: [PATCH 2/2] fix: XSSF test#
---
testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs b/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs
index 3642123c4..a997d923a 100644
--- a/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs
+++ b/testcases/ooxml/XSSF/Streaming/SheetDataWriterTests.cs
@@ -333,7 +333,7 @@ public void IfCellTypeIsStringShouldWriteStringCellXml()
var lines = File.ReadAllLines(_objectToTest.TemporaryFilePath());
Assert.True(lines.Length == 1);
- Assert.AreEqual("\'\'<>
&"? test:SLDFKj ", lines[0]);
+ Assert.AreEqual("\'\'<>
&"? test:SLDFKj ", lines[0]);
}