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

B2018-124 no longer need AllowedWatermarks list

Browse Source
This commit is contained in:
John Jenko 2018-09-10 19:35:45 +00:00
parent 010aa08668
commit 8cdc686f11
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -1565,24 +1565,24 @@ i = 0;
svgGroup.Add(PageItemToSvgUse(pageItem, FirstAndLast(box))); svgGroup.Add(PageItemToSvgUse(pageItem, FirstAndLast(box)));
break; break;
case "{DRAFTPAGE}": 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 plstr = plstr.Replace(token, "");// Remove token since it is handled now
break; break;
case "{REFERENCEPAGE}": 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 plstr = plstr.Replace(token, "");// Remove token since it is handled now
break; break;
case "{MASTERPAGE}": 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 plstr = plstr.Replace(token, "");// Remove token since it is handled now
break; break;
case "{SAMPLEPAGE}": 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 plstr = plstr.Replace(token, "");// Remove token since it is handled now
break; break;
case "{INFORMATIONPAGE}": //case "{INFORMATIONPAGE}":
if (!AllowedWatermarks.Contains("Information Only")) AllowedWatermarks.Add("Information Only"); // if (!AllowedWatermarks.Contains("Information Only")) AllowedWatermarks.Add("Information Only"); -- B2018-124 not needed anymore
break; // break;
case "{PROCTITLE}": case "{PROCTITLE}":
case "[PROCTITLE]": case "[PROCTITLE]":
case "{PROCTITLE1}": case "{PROCTITLE1}":

15
PROMS/Volian.Svg.Library/iTextSharp.cs
View File

@ -953,12 +953,13 @@ namespace Volian.Svg.Library
get { return _IsLandscape; } get { return _IsLandscape; }
set { _IsLandscape = value; } set { _IsLandscape = value; }
} }
private List<string> _AllowedWatermarks = new List<string>(); // B2018-124 we no longer need is list was not hanling "Information Only" water mark
public List<string> AllowedWatermarks //private List<string> _AllowedWatermarks = new List<string>();
{ //public List<string> AllowedWatermarks
get { return _AllowedWatermarks; } //{
set { _AllowedWatermarks = value; } // get { return _AllowedWatermarks; }
} // set { _AllowedWatermarks = value; }
//}
private Svg _MySvg; private Svg _MySvg;
public Svg MySvg public Svg MySvg
{ {
@ -1165,7 +1166,7 @@ namespace Volian.Svg.Library
private void DrawWatermark(PdfContentByte cb) private void DrawWatermark(PdfContentByte cb)
{ {
if (Watermark == null || Watermark.ToLower().Contains("none") || Watermark == "") return; 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(); cb.SaveState();
if (_WatermarkLayer != null) cb.BeginLayer(_WatermarkLayer); if (_WatermarkLayer != null) cb.BeginLayer(_WatermarkLayer);
if (IsLandscape) if (IsLandscape)