From 985b419736dfad529042331b93f18428e93ae116 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 12 Jun 2014 14:18:59 +0000 Subject: [PATCH] Fixed logic adding an RO before another RO in a table cell, Fixed logic adding a transition before another transition in a table cell. --- PROMS/Volian.Controls.Library/StepRTB.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index 03f79825..33824105 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -3036,7 +3036,7 @@ namespace Volian.Controls.Library int indx = Rtf.IndexOf(@"#Link:ReferencedObject:"); if (indx > 0) { - Match mro = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>"); + Match mro = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*?)\[END>"); string linkstr = mro.Groups[2].Value; string[] roparts = linkstr.Split(" ".ToCharArray()); ContentRoUsage rousg = null; @@ -3065,7 +3065,7 @@ namespace Volian.Controls.Library if (mt.Length > 0) { indx = mt.Index+6; // get past '#Link:" - Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>"); + Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*?)\[END>"); bool isSingleTran = true; if (Rtf.Substring(indx, 16).IndexOf("TransitionRange") >= 0) isSingleTran = false; string linkstr = m.Groups[2].Value;