Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

B2021-142 fixed invalid & character in table text when printing the table.

Browse Source
This commit is contained in:
John Jenko 2021-12-03 17:06:03 +00:00
parent 6828b5cca3
commit 617362fdb0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Volian.Controls.Library/VlnFlexGrid.cs
View File

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