From 1d113b519dd5483dcc7c07379d66f3d644b2579f Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Fri, 14 Sep 2018 14:06:04 +0000
Subject: [PATCH] B2018-127 Use the row and column from the merged cells range
 to update a selected table cell.

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

diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index 4a1b80f1..5a81a141 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -1285,6 +1285,7 @@ namespace Volian.Controls.Library
 			IsSaving = true;
 			if (MyFlexGrid.Row >= 0 && MyFlexGrid.Col >= 0 && MyStepRTB.EditMode) // Only if a Cell is Selected
 			{
+				CellRange cr = MyFlexGrid.GetMergedRange(MyFlexGrid.Selection.r1, MyFlexGrid.Selection.c1); // B2018-127 get merged range
 				int row = MyFlexGrid.Row;
 				int col = MyFlexGrid.Col;
 				//SaveContents();
@@ -1293,7 +1294,7 @@ namespace Volian.Controls.Library
 				DoNotRefresh = false;
 				MyFlexGrid.Row = row;
 				MyFlexGrid.Col = col;
-				MyFlexGrid[MyFlexGrid.Row, MyFlexGrid.Col] = MyStepRTB.Rtf;
+				MyFlexGrid[cr.r1, cr.c1] = MyStepRTB.Rtf; // B2018-127 this saves to the first cell in a merged range
 			}
 			if (!MyFlexGrid.IsDirty) return;
 			SaveContents();