From ad6774d2fcbda6abeed55118d871f101489bdd4b Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Mon, 29 Jun 2020 14:54:42 +0000
Subject: [PATCH] B2020-088: Pressing escape in table cell when all text is
 selected clears text

---
 PROMS/Volian.Controls.Library/GridItem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index 38adfae7..12e0aa3f 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -242,8 +242,9 @@ namespace Volian.Controls.Library
 			if (Initializing) return;
 			if (MyFlexGrid.Selection.IsSingleCell && MyFlexGrid.Row >= 0 && MyFlexGrid.Col >= 0)
 			{
-				object obj = MyFlexGrid[MyFlexGrid.Row, MyFlexGrid.Col];
-				_OrigRtf = obj == null ? string.Empty : obj.ToString();
+				// B2020-088: get string using method in case of merged cells
+				string rtf = MyFlexGrid.GetCellRTFString(MyFlexGrid.Row, MyFlexGrid.Col);
+				_OrigRtf = rtf == null ? string.Empty : rtf;
 			}
 		}
 		void MyStepRTB_KeyDown(object sender, KeyEventArgs e)