From 47ddfe285764cf2aa89a7cc99a52c789d45d366b Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 24 Oct 2016 16:27:32 +0000 Subject: [PATCH] Adjustments for Margins, Page Lengths, Page Width and a few Page List Items Fixed logic for Landscape Margins --- PROMS/Formats/fmtall/vcbaall.xml | Bin 94864 -> 94860 bytes PROMS/Formats/fmtall/vcbeppall.xml | Bin 94312 -> 95240 bytes .../Extension/DocumentExt.cs | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/vcbaall.xml b/PROMS/Formats/fmtall/vcbaall.xml index 10bf8317ad87cea4c9347b01ddd7700497ab44a2..7dbb5ba69160b5fe65b0e6d0256e939cd99ce3cf 100644 GIT binary patch delta 420 zcmZXPF-QV&7{z^e-Eo<LomfFc6gC7x$+fr$Aq@=2j#mAr~PimmDNIgj{a@@!pU3s%_<>t=L+F&VZ&cT2W`CW5L;dx>sZ) zU{VEm8Dc7jkQSToF|ucI>gev`9DBVaoN}iW6k4OnISD6l;y?KyO!msR8d6-D#-&2_ z1d@*4+m=Q7Ri*P7=IPghD(cTVwFQAJX4w~8Ekn+Qer5^qhlV0VlQ7Go(==0hHN-%?74l<)VkkXYiTgI@2+Kp z>1z=la?jz)Zb)|_%2H1OGA3|r`mC8rMA+F&m<-_C)LR7wF}Cp$y3m`T;t=M^H;o`W zxlP$=!Tju$6{gfIo)Pgdj3|{Ash zuQc_hPppi>Vm>R#ACoA%q_~iv(k9lWm=LF>G(6IZuuR!Jyi`mhM^z0fy&vI#x*Ghv zy9G^@B0_{`)0mZL_Yf7X?7$FhliV{22@VZoiVX+pT|Ban8^`}W?>($KZT>5#p4`hj M1-wdjGw9*`2dChUo&W#< diff --git a/PROMS/Formats/fmtall/vcbeppall.xml b/PROMS/Formats/fmtall/vcbeppall.xml index 21da0e9faa8493a98e6e5c371ad2338b685a9430..490e222508c3d3acb37a0de2af491b4dcd618bd1 100644 GIT binary patch delta 664 zcmZ9IUr1A77{U+P3_x-)k^R6sAMpqnW zEJ(TjZ4_y9S|h=Bg>GNfDIKb78Dy8)1$LVCvmROXu`KIg1MH%F2jy>w4bk=R4l5rj z-o-w;@v@Q3Hzz5b(Jc3T0f>q%O?aZva9*<}=e{e5TDOW_4$4(DZt57LOYgeL%zvWh zQjD**p_7^yztZxOpBoxNJm*D(%(HctSvt0L1An-xyAbEkHzE8W?F0B{6)8TYqG*+V zdfXBcpu=C{LXTk-l5ddPrIYb@hO*ywih>4@LgmVp|6cFosS9P*^8Nmy@JK6m^VJ3f z_;fE)*5d3e)cvexy+x628MT&26dI6G_>nMtw#;^pkeu@hT`L-nIE%3Za=sNj5k}j@ z9#r}JMi_|FQf2S>uk4ykBQNUtf)@c=c-1XrqwZ3pYkQNb7&{23Vn5t288Jx4pN};+ zG&vXGvSqt?ds*gHiks|!yaO6Jw*>= z?7)6dP(DNt5hdNxfgXlWAuWbhBt(Ra9%L{X;ll``u8l5xXasRMaL)I~`F=m=_q$U! z*K6j2s_>nMCigVUu_+c~6Z#rv(=5vpY=q6|dxA~!?mo8`RT2`Py=K$i`O5d9@`Z|9 zE57zie0BE$UwU7sWIvo*@rMIie*L?|Z+@B;a~?dw^0q>?Zj>qCg&tZ9!bx*S5#pJW zkGvLSdF^^9&wsN~#(`J5nxbM57r6IhgC{@hbd4=q3_{fc)u+ey#(S;?mFzP_o8OShQx1ITso~q66M3#ln=~S4akcvfE5L&sOZwMH{wu)^EetX zBKOS3Wu9NR^YNc?e!1zVwKnuDXG~(qjS~Jd^`(MQiFO9jA%~dCuQXbXZU@=@@Kd=L zTRil&Lk_Yqk8SqS(jad9F7f%Y)xdX(FMWs{GGP7Ez8NH=I3cDYXoAuabc)d^hM+gP zNr5O%@<8<#J#y)KIF4r)d4Pop=W$Lx%LeFq0&cmVouSGYJk&@aOWqU$l$%7FC*PWA zK7}q`uKL8|OHd?PWvZwoa9XAhBUll4lPE}rqgi)kVX-ibBkhLxuNa$nkw)<^SVB*T cSPh>&bJEQ{VkV~#{ZA!Eg)wv;@QHiB01*TnG5`Po diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 608df58f..e84b250b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -1229,10 +1229,14 @@ namespace VEPROMS.CSLA.Library { // the + 1 in the next line allows for rounding. if ((newWidth > (8.5f * 72)) && newWidth > newLength) - if(myDoc.PageSetup.Orientation != LBWdOrientation.wdOrientLandscape) + if (myDoc.PageSetup.Orientation != LBWdOrientation.wdOrientLandscape) + { myDoc.PageSetup.Orientation = LBWdOrientation.wdOrientLandscape; + myDoc.PageSetup.RightMargin = 11 * 72 - newWidth; + } + else + myDoc.PageSetup.RightMargin = newRight; myDoc.PageSetup.BottomMargin = newBottom; - myDoc.PageSetup.RightMargin = newRight; myDoc.PageSetup.LeftMargin = newLeft; myDoc.PageSetup.TopMargin = newTop; }