diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index fa55aa45..46c1f67d 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1031,7 +1031,8 @@ namespace Volian.Controls.Library } #endregion #region Home Tab - private bool _PastePlainText = false; + private bool _PastePlainTextOvrRide = false; + private bool _PasteStepTextOvrRide = false; private void btnPaste_Click(object sender, EventArgs e) { StartGridEditing(SelectionOption.End); @@ -1053,17 +1054,20 @@ namespace Volian.Controls.Library cmb.SelectedText = myDO.GetData(DataFormats.UnicodeText).ToString(); else if (myDO.GetDataPresent(DataFormats.Text)) cmb.SelectedText = myDO.GetData(DataFormats.Text).ToString(); - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; return; } else { SaveErrorInLogProblemWithType(ctrl); - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; return; } } - if (myDO.GetDataPresent(DataFormats.Rtf) && !_PastePlainText && !PastePlainTextSetting) + //if (myDO.GetDataPresent(DataFormats.Rtf) && !_PastePlainTextOvrRide && !PastePlainTextSetting) + if (myDO.GetDataPresent(DataFormats.Rtf) && (_PasteStepTextOvrRide || (!_PastePlainTextOvrRide && !PastePlainTextSetting))) { string tmpForLink = myDO.GetData(DataFormats.Rtf).ToString(); tmpForLink = Regex.Replace(tmpForLink, @"#Link:ReferencedObject:[0-9]+ ", @"#Link:ReferencedObject: "); @@ -1087,7 +1091,8 @@ namespace Volian.Controls.Library //myRtb.SelectedText = myDO.GetData(DataFormats.Text).ToString(); } if (myRtb.SelectionLength == 0 && myRtb is StepRTB) myRtb.SelectionFont = (myRtb as StepRTB).MyStyleFont.WindowsFont; - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; } private void SaveErrorInLogProblemWithType(Control ctrl) @@ -2449,7 +2454,14 @@ namespace Volian.Controls.Library private void btnPasteText_Click(object sender, EventArgs e) { StartGridEditing(SelectionOption.End); - _PastePlainText = true; + _PastePlainTextOvrRide = true; + btnPaste_Click(sender, e); + } + + private void btnPasteStepText_Click(object sender, EventArgs e) + { + StartGridEditing(SelectionOption.End); + _PasteStepTextOvrRide = true; btnPaste_Click(sender, e); } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 6dde583c..95a96df7 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ