Ensure tabs in richtext are encoded and decoded correctly (#1177)

EPPlusSoftware · Nov 23, 2023 · 4ba80cd · 4ba80cd
1 parent 034f1f1
commit 4ba80cd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/EPPlus/ExcelWorkbook.cs b/src/EPPlus/ExcelWorkbook.cs
@@ -1363,9 +1363,7 @@ private void SaveSharedStringHandler(ZipOutputStream stream, CompressionLevel co
                 SharedStringItem ssi = _sharedStrings[t];
                 if (ssi.isRichText)
                 {
-                    cache.Append("<si>");
-                    ConvertUtil.ExcelEncodeString(cache, t);
-                    cache.Append("</si>");
+                    cache.Append($"<si>{t}</si>");
                 }
                 else
                 {

diff --git a/src/EPPlus/Style/ExcelRichText.cs b/src/EPPlus/Style/ExcelRichText.cs
@@ -19,6 +19,7 @@ Date               Author                       Change
 using OfficeOpenXml.Export.HtmlExport;
 using OfficeOpenXml.Drawing;
 using OfficeOpenXml.Drawing.Theme;
+using OfficeOpenXml.Utils;
 
 namespace OfficeOpenXml.Style
 {
@@ -48,13 +49,14 @@ public string Text
 
             get
             {
-                return GetXmlNodeString(TEXT_PATH);
+                return ConvertUtil.ExcelDecodeString(GetXmlNodeString(TEXT_PATH));
             }
             set
             {
                 if (value == null) throw new InvalidOperationException("Text can't be null");
                 _collection.ConvertRichtext();
-                SetXmlNodeString(TEXT_PATH, value, false);
+                var encodedValue = ConvertUtil.ExcelEncodeString(value);
+                SetXmlNodeString(TEXT_PATH, encodedValue, false);
                 if (PreserveSpace)
                 {
                     XmlElement elem = TopNode.SelectSingleNode(TEXT_PATH, NameSpaceManager) as XmlElement;

diff --git a/src/EPPlusTest/Issues.cs b/src/EPPlusTest/Issues.cs
@@ -5530,5 +5530,30 @@ public void i1146()
                 }
             }
         }
+        [TestMethod]
+        public void s554()
+        {
+            string s = "captain \t cave \n\tman";
+
+            using (var package = OpenPackage("tabDecoding.xlsx", true))
+            {
+                var sheet = package.Workbook.Worksheets.Add("Sheety");
+                sheet.Cells["A1"].RichText.Add(s);
+                var richText = sheet.Cells["A1"].RichText;
+                //Should still contain \t character
+                package.Save();
+            }
+
+            //Ensure value is decoded from _x0009_ to \t
+            using (var package = OpenPackage("tabDecoding.xlsx"))
+            {
+                var sheet = package.Workbook.Worksheets[0];
+                var cell = sheet.Cells[1, 1];
+
+                string text = cell.Value.ToString();
+                Assert.AreEqual("captain \t cave \n\tman", text);
+                SaveAndCleanup(package);
+            }
+        }
     }
 }