#1387 - Fixed an issue where RichText wasn't set properly on a multi-…

…cell range (#1405)
EPPlusSoftware · Apr 5, 2024 · 9dffadd · 9dffadd
1 parent 796a4f1
commit 9dffadd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/src/EPPlus/ExcelWorksheet.cs b/src/EPPlus/ExcelWorksheet.cs
@@ -1443,8 +1443,9 @@ private void LoadHyperLinks(XmlReader xr)
         internal ExcelRichTextCollection GetRichText(int row, int col, ExcelRangeBase r = null)
         {
             var v = GetCoreValueInner(row, col);
-            var isRt = _flags.GetFlagValue(row, col, CellFlags.RichText);
-            if (isRt && v._value is ExcelRichTextCollection rtc)
+            //var isRt = _flags.GetFlagValue(row, col, CellFlags.RichText);
+            //if (isRt && v._value is ExcelRichTextCollection rtc)
+            if (v._value is ExcelRichTextCollection rtc)
             {
                 return rtc;
             }

diff --git a/src/EPPlus/Style/RichText/ExcelRichTextCollection.cs b/src/EPPlus/Style/RichText/ExcelRichTextCollection.cs
@@ -171,7 +171,7 @@ public ExcelRichText Insert(int index, string text)
                 rt.FontName = prevRT.FontName;
                 rt.Charset = prevRT.Charset;
                 rt.Family = prevRT.Family;
-                rt.ColorSettings = prevRT.ColorSettings;
+                rt.ColorSettings = prevRT.ColorSettings.Clone();
                 rt.PreserveSpace = prevRT.PreserveSpace;
             }
             else if(_cells == null)
@@ -197,8 +197,8 @@ public ExcelRichText Insert(int index, string text)
                 }
                 if (_isComment == false)
                 {
-                    _cells._worksheet._flags.SetFlagValue(_cells._fromRow, _cells._toCol, true, CellFlags.RichText);
-                    _cells.SetIsRichTextFlag(true);
+                    _cells._worksheet._flags.SetFlagValue(_cells._fromRow, _cells._fromCol, true, CellFlags.RichText);
+                    //_cells.SetIsRichTextFlag(true);
                 }
             }
             _list.Insert(index, rt);

diff --git a/src/EPPlus/Style/RichText/ExcelRichTextColor.cs b/src/EPPlus/Style/RichText/ExcelRichTextColor.cs
@@ -68,5 +68,17 @@ public bool HasAttributes
         /// A negative value means not set.
         /// </summary>
         public int? Indexed { get; set; }
+
+        internal ExcelRichTextColor Clone()
+        {
+            return new ExcelRichTextColor
+            {
+                Rgb = this.Rgb,
+                Theme = this.Theme,
+                Tint = this.Tint,
+                Auto = this.Auto,
+                Indexed = this.Indexed
+            };
+        }
     }
 }
diff --git a/src/EPPlusTest/Core/Worksheet/WorksheetCoreTests.cs b/src/EPPlusTest/Core/Worksheet/WorksheetCoreTests.cs
@@ -28,6 +28,7 @@ Date               Author                       Change
  *******************************************************************************/
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OfficeOpenXml;
+using System.Drawing;
 
 namespace EPPlusTest.Core.Worksheet
 {
@@ -89,52 +90,48 @@ public void RichTextFlagShouldBeCleanedWhenOverwritingValue()
                 var ws = p.Workbook.Worksheets.Add("RichTextOverwriteValue");
 
                 ws.Cells["A1:B2"].RichText.Add("RichText");
-
+                Assert.IsTrue(ws.Cells["A1"].IsRichText);
                 ws.Cells["A1"].Value = "Text";
-                ws.Cells["B2"].Value = "Text";
                 Assert.IsFalse(ws.Cells["A1"].IsRichText);
-                Assert.IsTrue(ws.Cells["A2"].IsRichText);
-                Assert.IsTrue(ws.Cells["B1"].IsRichText);
+                Assert.IsFalse(ws.Cells["A2"].IsRichText);
+                Assert.IsFalse(ws.Cells["B1"].IsRichText);
                 Assert.IsFalse(ws.Cells["B2"].IsRichText);
             }
         }
 
         [TestMethod]
-        public void RichTextFlagShouldBeCleanedWhenOverwritingValueAddress()
+        public void RichTextFlagShouldBeCleanedWhenOverwritingWithArray()
         {
             using (var p = new ExcelPackage())
             {
-                var ws = p.Workbook.Worksheets.Add("RichTextOverwriteAddress");
+                var ws = p.Workbook.Worksheets.Add("RichTextOverwrite");
 
-                ws.Cells["A1:B2"].RichText.Add("RichText");
+                ws.Cells["A1:C3"].RichText.Add("RichText");
                 Assert.IsTrue(ws.Cells["A1"].IsRichText);
-                Assert.IsTrue(ws.Cells["B2"].IsRichText);
+                Assert.IsFalse(ws.Cells["B2"].IsRichText);
 
-                ws.Cells["A1:B2"].Value = "Text";
+                ws.Cells["A1:B2"].Value = new string[,] { { "Text", "Text" }, { "Text", "Text" } };
                 Assert.IsFalse(ws.Cells["A1"].IsRichText);
                 Assert.IsFalse(ws.Cells["B2"].IsRichText);
             }
         }
 
         [TestMethod]
-        public void RichTextFlagShouldBeCleanedWhenOverwritingWithArray()
+        public void RichTextColorSettingsShouldUseDifferentInstances()
         {
             using (var p = new ExcelPackage())
             {
-                var ws = p.Workbook.Worksheets.Add("RichTextOverwrite");
-
-                ws.Cells["A1:C3"].RichText.Add("RichText");
-                Assert.IsTrue(ws.Cells["A1"].IsRichText);
-                Assert.IsTrue(ws.Cells["B2"].IsRichText);
-
-                ws.Cells["A1:B2"].Value = new string[,] { { "Text", "Text" }, { "Text", "Text" } };
-                Assert.IsFalse(ws.Cells["A1"].IsRichText);
-                Assert.IsFalse(ws.Cells["B2"].IsRichText);
-                Assert.IsTrue(ws.Cells["C1"].IsRichText);
-                Assert.IsTrue(ws.Cells["C3"].IsRichText);
-                Assert.IsTrue(ws.Cells["A3"].IsRichText);
+                var ws = p.Workbook.Worksheets.Add("Sheet1");
+
+                var rt = ws.Cells["A1"].RichText;
+                var rt1 = rt.Add("No1");
+                var rt2 = rt.Add("No2");
+                rt2.Color = Color.Red;
+                Assert.AreEqual(rt1.Color, Color.Empty);
+                Assert.AreEqual(rt2.Color, Color.Red);
             }
         }
+
         [TestMethod]
         public void FormulaShouldBeCleanedWhenOverwritingWithArray()
         {