From cc4b8a2020995931c5989604aa70da37e5e43f34 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 10 Aug 2012 10:41:31 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/DisplayText.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index ae9df4ab..1228c1e0 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -382,7 +382,7 @@ namespace Volian.Controls.Library string lookFor = string.Format(@""); MatchCollection matches = Regex.Matches(text, lookFor); if (matches.Count == 0) return text; - string retstr = null; + string retstr = text; for (int i = matches.Count - 1; i >= 0; i--) { Match m = matches[i]; @@ -395,8 +395,8 @@ namespace Volian.Controls.Library if (m.Groups[7].Value != "" && StepTransition(int.Parse(m.Groups[7].Value))) { System.Text.RegularExpressions.Group g = m.Groups[3]; - string beforeTran = text.Substring(0, g.Index); - string afterTran = text.Substring(g.Index + g.Length); + string beforeTran = retstr.Substring(0, g.Index); + string afterTran = retstr.Substring(g.Index + g.Length); string newvalue = g.ToString(); int indexLastSpace = newvalue.LastIndexOf(' '); if (indexLastSpace >= 0) @@ -409,7 +409,6 @@ namespace Volian.Controls.Library } } } - if (retstr == null) return text; // no transition processing occurred, just return original string. return retstr; } private string ReplaceLastSpaceWithHardSpace(string str)