diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index f053d0fe..65707ae2 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -1061,6 +1061,7 @@ namespace Volian.Controls.Library try { str = AdjustHeightAndWidthForDPI(str); + str = Regex.Replace(str, "&(?![a-z])", "&"); //B2021-142 fix &'s in text screen - so they are considered text instead of xml using (StringReader sr = new StringReader(str)) { ReadXml(sr); @@ -1084,8 +1085,9 @@ namespace Volian.Controls.Library DPIscreen = (int)gr.DpiX; } XmlDocument xd = new XmlDocument(); - xd.LoadXml(str); - XmlNode xn = xd.SelectSingleNode("//DPI"); + str = Regex.Replace(str, "&(?![a-z])", "&"); //B2021-142 fix &'s in text screen - so they are considered text instead of xml + xd.LoadXml(str); + XmlNode xn = xd.SelectSingleNode("//DPI"); if (xn != null && xn.InnerText != DPIscreen.ToString()) { int DPIgrid = int.Parse(xn.InnerText);