From b0c6ecdde1ba1736e06e2c5fbb92f2491264b3ff Mon Sep 17 00:00:00 2001 From: John Date: Mon, 9 Nov 2020 19:46:53 +0000 Subject: [PATCH] Corrected issue of un-needed extra information appearing in baseline meta file for the Calvert Alarms. A pagination fix that was put on for Westinghouse (B2020-047) cause extra (not needed) information in the baseline meta file for Calvert Alarms. Un-doing that change corrected the Calvert Alarm baseline meta file and the pagination bug (B2020-047) is still fixed as it appears on other pagination fix had corrected the Westinghouse issue. --- PROMS/Volian.Print.Library/vlnParagraph.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index d61f1392..fea5371e 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1439,17 +1439,18 @@ namespace Volian.Print.Library yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin; yBottomMargin = Math.Max(0, yTopMargin - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.PageLength); } - else // B2020-047 move check of PrintSectionPage to after the ResetSvg + // B2020-047 move check of PrintSectionPage to after the ResetSvg + // B2020-152 un-did the change for B2020-047 which was put in for Westinghouse. The issue reported for B2020-047 remained corrected + else if (MyPageHelper.PrintedSectionPage > 0) { MyPageHelper.ResetSvg(); - if (MyPageHelper.PrintedSectionPage > 0 && MyItemInfo.ActiveSection != null && (MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PrintSectOnFirst) == E_DocStructStyle.DSS_PrintSectOnFirst) + if (MyItemInfo.ActiveSection != null && (MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PrintSectOnFirst) == E_DocStructStyle.DSS_PrintSectOnFirst) { yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin + MyPageHelper.PrintedSectionPage; MyPageHelper.YTopMargin = yTopMargin; yBottomMargin = Math.Max(0, _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.PageLength); } } - } private string GetSectCombinedTab(ItemInfo tmp) {