From 0ac678ebda72d408860cecd32815103b07b99e3e Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 28 Apr 2015 12:56:24 +0000 Subject: [PATCH] =?UTF-8?q?AEP:=20Use=20Docstyle=E2=80=99s=20end=20message?= =?UTF-8?q?=20flag=20when=20printing=20Word=20docs.=20Adjust=20location=20?= =?UTF-8?q?of=20PSI=20separator=20in=20Number=20box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/AEP_01all.xml | Bin 27352 -> 27352 bytes PROMS/Volian.Print.Library/PromsPrinter.cs | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/PROMS/Formats/fmtall/AEP_01all.xml b/PROMS/Formats/fmtall/AEP_01all.xml index 05d3d48a759f6b74bd1bba57f4e6f75c9aeae926..b17974fbb1131c30f4a0bef8c7348707f49a5cfd 100644 GIT binary patch delta 26 kcmV+#0OkMK)dASm0kF1KlfqyeldxMjlfG5Fv&L5v6TXZM7XSbN delta 24 gcmca{mGQ<^#tqxT7>y?jM*N@rFNA0Fp>Q!_0GKKZE&u=k diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index fa04ab93..bbb00acf 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -939,6 +939,12 @@ namespace Volian.Print.Library float wtpm = (float)mySection.MyDocStyle.Layout.PageWidth - (float)mySection.MyDocStyle.Layout.LeftMargin; float centerpos = (float)mySection.MyDocStyle.Layout.LeftMargin + (wtpm - (mySection.MyDocStyle.End.Message.Length * mySection.MyDocStyle.End.Font.CharsToTwips)) / 2; float yBottomMargin = Math.Max(0, (float)mySection.MyDocStyle.Layout.TopMargin - (float)mySection.MyDocStyle.Layout.PageLength - 2 * vlnPrintObject.SixLinesPerInch); + float adjMsgY = 0; + if ((float)mySection.MyDocStyle.End.Flag < 0) // Adjust this many lines down the page. + { + adjMsgY = (float)(-(float)mySection.MyDocStyle.End.Flag * vlnPrintObject.SixLinesPerInch); + if (ylocation - adjMsgY > mySection.MyDocStyle.Layout.FooterLength) ylocation = ylocation - adjMsgY; + } bool landscape = (mySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_WordContentLandscaped) == E_DocStructStyle.DSS_WordContentLandscaped; if (landscape) {