diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index ed6c94cd..7b2b3285 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -121,7 +121,7 @@ namespace Volian.Controls.Library TextFont = itemInfo.GetItemFont();//GetItemFont(); // if in print mode, and this is the HLS of a smart template (checklist formats), add a space before and // after the HLS text - this allows for the vertical bar characters to be added. - if (itemInfo.IsStep && itemInfo.FormatStepData.UseSmartTemplate && epMode == E_EditPrintMode.Print) Console.WriteLine("here"); + //if (itemInfo.IsStep && itemInfo.FormatStepData.UseSmartTemplate && epMode == E_EditPrintMode.Print) Console.WriteLine("here"); string addSpace = (itemInfo.IsStep && itemInfo.FormatStepData.UseSmartTemplate && epMode == E_EditPrintMode.Print) ? " " : ""; string text = prefix + addSpace + InfoText + addSpace + suffix; _MyFormat = itemInfo.ActiveFormat; @@ -331,7 +331,7 @@ namespace Volian.Controls.Library } private string DoROAdjustments(string text) { - Regex regRefObj = new Regex(@"\#Link\:ReferencedObject:([0-9]*) ([0-9a-zA-Z]*) ([0-9]*)", RegexOptions.Singleline); + Regex regRefObj = new Regex(@"\#Link\:ReferencedObject:([0-9]*|) ([0-9a-zA-Z]*) ([0-9]*)", RegexOptions.Singleline); string strippedText = StaticStripRtfCommands(text); // (\\[^v \\]+)* --> look for any rtf commands (first part of lookFor) // \\v0 --> end of comment @@ -351,6 +351,8 @@ namespace Volian.Controls.Library string beforeRO = StaticStripRtfCommands(text.Substring(0, g.Index)); string afterRO = StaticStripRtfCommands(text.Substring(g.Index + g.Length)); Match myMatch = regRefObj.Match(m.ToString()); + if(m.ToString().ToUpper().Contains("")) + _MyLog.WarnFormat("Unprocessed RO in {0},({1})",_MyItemInfo.ShortPath,g.ToString()); int dbid = System.Convert.ToInt32(myMatch.Groups[2].Value.Substring(0, 4), 16); int rodbid = int.Parse(myMatch.Groups[3].Value); ROFstInfo myROFst = _MyItemInfo.MyDocVersion.GetROFst(rodbid);