From 8cdc686f116a7c6adf96b7f9cec7dad1545d465c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Sep 2018 19:35:45 +0000 Subject: [PATCH] B2018-124 no longer need AllowedWatermarks list --- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 14 +++++++------- PROMS/Volian.Svg.Library/iTextSharp.cs | 15 ++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index e5ee1a75..d6206065 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1565,24 +1565,24 @@ i = 0; svgGroup.Add(PageItemToSvgUse(pageItem, FirstAndLast(box))); break; case "{DRAFTPAGE}": - if (!AllowedWatermarks.Contains("Draft")) AllowedWatermarks.Add("Draft"); + //if (!AllowedWatermarks.Contains("Draft")) AllowedWatermarks.Add("Draft"); -- B2018-124 not needed anymore plstr = plstr.Replace(token, "");// Remove token since it is handled now break; case "{REFERENCEPAGE}": - if (!AllowedWatermarks.Contains("Reference")) AllowedWatermarks.Add("Reference"); + //if (!AllowedWatermarks.Contains("Reference")) AllowedWatermarks.Add("Reference"); -- B2018-124 not needed anymore plstr = plstr.Replace(token, "");// Remove token since it is handled now break; case "{MASTERPAGE}": - if (!AllowedWatermarks.Contains("Master")) AllowedWatermarks.Add("Master"); + //if (!AllowedWatermarks.Contains("Master")) AllowedWatermarks.Add("Master"); -- B2018-124 not needed anymore plstr = plstr.Replace(token, "");// Remove token since it is handled now break; case "{SAMPLEPAGE}": - if (!AllowedWatermarks.Contains("Sample")) AllowedWatermarks.Add("Sample"); + //if (!AllowedWatermarks.Contains("Sample")) AllowedWatermarks.Add("Sample"); -- B2018-124 not needed anymore plstr = plstr.Replace(token, "");// Remove token since it is handled now break; - case "{INFORMATIONPAGE}": - if (!AllowedWatermarks.Contains("Information Only")) AllowedWatermarks.Add("Information Only"); - break; + //case "{INFORMATIONPAGE}": + // if (!AllowedWatermarks.Contains("Information Only")) AllowedWatermarks.Add("Information Only"); -- B2018-124 not needed anymore + // break; case "{PROCTITLE}": case "[PROCTITLE]": case "{PROCTITLE1}": diff --git a/PROMS/Volian.Svg.Library/iTextSharp.cs b/PROMS/Volian.Svg.Library/iTextSharp.cs index 3f0a2deb..5d6f495f 100644 --- a/PROMS/Volian.Svg.Library/iTextSharp.cs +++ b/PROMS/Volian.Svg.Library/iTextSharp.cs @@ -953,12 +953,13 @@ namespace Volian.Svg.Library get { return _IsLandscape; } set { _IsLandscape = value; } } - private List _AllowedWatermarks = new List(); - public List AllowedWatermarks - { - get { return _AllowedWatermarks; } - set { _AllowedWatermarks = value; } - } + // B2018-124 we no longer need is list was not hanling "Information Only" water mark + //private List _AllowedWatermarks = new List(); + //public List AllowedWatermarks + //{ + // get { return _AllowedWatermarks; } + // set { _AllowedWatermarks = value; } + //} private Svg _MySvg; public Svg MySvg { @@ -1165,7 +1166,7 @@ namespace Volian.Svg.Library private void DrawWatermark(PdfContentByte cb) { if (Watermark == null || Watermark.ToLower().Contains("none") || Watermark == "") return; - if (!AllowAllWatermarks && !AllowedWatermarks.Contains(Watermark)) return; + //if (!AllowAllWatermarks && !AllowedWatermarks.Contains(Watermark)) return; -- B2018-124 not needed anymore with above if statement - this does not hanle "Information Only" cb.SaveState(); if (_WatermarkLayer != null) cb.BeginLayer(_WatermarkLayer); if (IsLandscape)