From 085814045cd993124817d9c103984e3784e0029c Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 18 Nov 2016 13:30:40 +0000 Subject: [PATCH] =?UTF-8?q?B2016-260:=20fix=20check=20that=20determines=20?= =?UTF-8?q?if=20step=E2=80=99s=20content=20is=20an=20equation=20(including?= =?UTF-8?q?=20paste=20buffer)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/RtfRawItem.cs | 2 +- PROMS/Volian.Controls.Library/StepRTB.cs | 3 +-- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/RtfRawItem.cs b/PROMS/Volian.Controls.Library/RtfRawItem.cs index 87def310..59efb31c 100644 --- a/PROMS/Volian.Controls.Library/RtfRawItem.cs +++ b/PROMS/Volian.Controls.Library/RtfRawItem.cs @@ -156,7 +156,7 @@ namespace Volian.Controls.Library { MyStepRTB.VwMode = MyStepPanel.VwMode; Size sz = GetRtfRawSize(MyStepRTB.Rtf); - if (MyStepRTB.Rtf == null || MyStepRTB.Rtf == "" || !MyStepRTB.Rtf.ToUpper().Contains("EQUAT")) // this is a new insert + if (MyStepRTB.Rtf == null || MyStepRTB.Rtf == "" || !MyStepRTB.Rtf.ToUpper().Contains("OBJCLASS EQUATION")) // this is a new insert { sz.Width = 50; sz.Height = 50; diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index 52296d23..aa018e67 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -2081,8 +2081,7 @@ namespace Volian.Controls.Library try { richTextBox1.Paste(frm); - // if (richTextBox1.Rtf.ToUpper().Contains("EQUAT") || richTextBox1.Rtf.ToUpper().Contains("VISIO")) hasEquation = true; - if (richTextBox1.Rtf.ToUpper().Contains("EQUAT")) hasEquation = true; + if (richTextBox1.Rtf.ToUpper().Contains("OBJCLASS EQUATION")) hasEquation = true; } catch (Exception ex) { diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 4fd29361..d7433d98 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1241,7 +1241,7 @@ namespace Volian.Controls.Library try { richTextBox1.Paste(frm); - if (richTextBox1.Rtf.ToUpper().Contains("EQUAT")) noEquationData = false; + if (richTextBox1.Rtf.ToUpper().Contains("OBJCLASS EQUATION")) noEquationData = false; } catch (Exception ex) {