From c2a6d3b61078eb503f56e9d68867c71f936d4c4e Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 9 Jan 2013 13:31:28 +0000 Subject: [PATCH] --- .../Extension/DocumentExt.cs | 4 +++- PROMS/fmtxml/WST2all.xml | Bin 48946 -> 49078 bytes PROMS/fmtxml/wst2.svg | Bin 5592 -> 6300 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 98cd1602..27a773c6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -776,7 +776,9 @@ namespace VEPROMS.CSLA.Library float oldRight = myDoc.PageSetup.RightMargin; float oldHeight = myDoc.PageSetup.PageHeight; float oldWidth = myDoc.PageSetup.PageWidth; - float newRight = Math.Max(0, oldWidth - (newWidth + newLeft)); + // in the following line, the 2 accounts for a difference between how word treats margin versus + // ours, we are not exactly sure why. + float newRight = Math.Max(0, oldWidth - (newWidth + 2)); float newBottom = Math.Max(0, oldHeight - (newLength + newTop + 1)); //Console.WriteLine("{0},{1},{2},{3},{4},{5},{6},{7},{8},{9}", newTop, newLeft, newLength, newWidth, oldTop, oldLeft, oldBottom, oldRight,oldHeight,oldWidth); if (printingMode) diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml index 914e9caf76d4b25ebfdecdd348855d6b9728537a..cd538ac9163b727e92d0c7f64c818fa180d73b39 100644 GIT binary patch delta 231 zcmdn=k7?U~rVWo~FzYfHPF8Ge1k%Qn3oDN^8#7o;{@Am4vOu#LqsiohMYnE`_m;u$ypX}C_0cLM(n++9PIQc_68>8uD!EWKnTpa>X(}O{xnq~~O z3`z_N3_%R}4CM^AK(--+0fPxx%o!+_0~Uk0CwQ{X0=3EedIf;CE0#^3{9{4RWWF*8 wuYB{ng>4c*3r#2UFLP%$U@(|$xX+f^0?0Sq*gu(PrQc+OMRuDN_6RWp0L~Un&Hw-a delta 135 zcmdn?pJ~%SrVWo~Z2nMjfqC-2-i*l#bG;@XC|Wd`XI=)7)|*tTHTlduHz0G#ZiL5V?u!I>eSA&0>h$cD(3 lPnIcn+Pq_ti^OER^~)w-P-mGexAMs39gFNXFWDo+3;?9yIlKS> diff --git a/PROMS/fmtxml/wst2.svg b/PROMS/fmtxml/wst2.svg index 29cf85f9bf1680db3c59ccd47973c03ee5e70177..3e14d897091afe2b737c1b417da0f9e96f3a77eb 100644 GIT binary patch delta 345 zcmcbiJ;!hZ8`I=d{6gF|4EhY|40a5>3|y17nPexI@W@ThVk(%#D+81knY@98ZE^#% zz~l++Jd+;?u}yYh;hQYQ9EK|0g~}C}e1Jn>vK31XRCx0S789n)Rm@^2rZh0gOg3S+ zL)SWiy#iH8Zt@&5val-OX`q?mhlNqF5^XU8A#{>XB1EsrvZZ=gE@l|gZ|`t zZu!koT!(-T5;B<_z$=2`y#^*JW>W@($?F-zL29_27|ehgAt6-A6Uc1LU delta 202 zcmbPZctd*w8xyM`gC2v?wsjg->hp R6oGk@zX_^rt`SsV2LL8DHb4LX