diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs index 114fccb2..1a5c7699 100644 --- a/PROMS/Volian.Controls.Library/GridItem.cs +++ b/PROMS/Volian.Controls.Library/GridItem.cs @@ -79,7 +79,8 @@ namespace Volian.Controls.Library } break; case Keys.Delete: - MyFlexGrid.ClearSelectedCellText(); + if (!MyFlexGrid.IsRoTable) + MyFlexGrid.ClearSelectedCellText(); break; } } @@ -274,6 +275,7 @@ namespace Volian.Controls.Library { if (MyFlexGrid.IsRoTable) { + MyFlexGrid.MergedRanges.Clear(); MyFlexGrid.Clear(); ConvertTableToGrid(args.RawValText); MyFlexGrid.RODbId = args.RODbID; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 64b564c7..2941dbd9 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1547,6 +1547,7 @@ namespace Volian.Controls.Library public void DoCopyStep() { // highlight selected step(s) and prompt to see if selection is what user wants: + if (MyFlexGrid != null) MyEditItem.IdentifyMe(true); MyEditItem.IdentifyChildren(true); DialogResult dr = MessageBox.Show("Step as Marked?", "Identify Step To Be Copied", MessageBoxButtons.YesNo); if (dr == DialogResult.Yes)