diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index e4d82813..6a77b4b3 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -36,7 +36,7 @@ namespace VEPROMS.CSLA.Library if (forceConvertToText) newvalue = "?"; string findLink = @""; - MatchCollection ms = Regex.Matches(Text, findLink); + MatchCollection ms = Regex.Matches(Text, findLink, RegexOptions.Singleline); //string lookFor = string.Format(@"", rousg.ROUsageID); string lookFor; if (tran == null) diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index dedec538..880d3096 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -229,7 +229,7 @@ namespace Volian.Controls.Library } private bool InLinkedText(string text, int idx) { - MatchCollection mc = Regex.Matches(text, @""); + MatchCollection mc = Regex.Matches(text, @"", RegexOptions.Singleline); if (mc.Count == 0) return false; foreach (Match m in mc) if (m.Index < idx && m.Index + m.Length > idx) return true; @@ -1958,7 +1958,7 @@ namespace Volian.Controls.Library { if (_TextAndLink != null) { - Match m = Regex.Match(_TextAndLink, @""); + Match m = Regex.Match(_TextAndLink, @"", RegexOptions.Singleline); if(m.Groups[3].Value == " ") return m.Groups[4].Value; return m.Groups[3].Value + m.Groups[4].Value; @@ -1969,7 +1969,7 @@ namespace Volian.Controls.Library { if (_TextAndLink != null) { - Match m = Regex.Match(_TextAndLink, @""); + Match m = Regex.Match(_TextAndLink, @"", RegexOptions.Singleline); int myIndex = m.Groups[4].Index; int myLength = m.Groups[4].Length; if (m.Groups[3].Value != " ") diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index e8455170..b1dfe5d1 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -2888,7 +2888,7 @@ namespace Volian.Controls.Library { StringBuilder sb = new StringBuilder(); int lastIndex = 0; - MatchCollection mc = Regex.Matches(line, @""); + MatchCollection mc = Regex.Matches(line, @"", RegexOptions.Singleline); foreach (Match m in mc) { sb.Append(line.Substring(lastIndex, m.Index - lastIndex)); // Append text before the link @@ -2914,7 +2914,7 @@ namespace Volian.Controls.Library string lineAbove = RemoveLinkComments(Lines[row-1]); string lineBelow = RemoveLinkComments(Lines[row+1]); int rowOffset = GetFirstCharIndexFromLine(row); - MatchCollection matchCollection = Regex.Matches(line, @""); //, RegexOptions.Singleline); + MatchCollection matchCollection = Regex.Matches(line, @"", RegexOptions.Singleline);// this last parameter was commented out in 7/24/09 but it appears to be valid if (matchCollection.Count == 0) matchCollection = Regex.Matches(line, @""); Match match = matchCollection.Count > 0 ? matchCollection[0] : null;