From 741c430f6c7e289543f1f73ce6568e1f07a7ea48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 28 Aug 2013 15:21:23 +0100
Subject: [PATCH] Resolves: fdo#65924 retweak the border positions

required due to 45a8eaf9c55f2686f69118641d8a8992a86dfe31

Change-Id: Ibffc9b4a5eaa8ad538ce53f0389519721fdbcf20
---
 icon-themes/galaxy/sw/res/page-shadow-mask.png | Bin 461 -> 527 bytes
 sw/source/core/layout/paintfrm.cxx             |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/icon-themes/galaxy/sw/res/page-shadow-mask.png b/icon-themes/galaxy/sw/res/page-shadow-mask.png
index 1e5c32b7530791a4dd0fe9c1e72661ca4e3a754d..495afa0ad7b6cdb941867ace9287b0df3df19965 100644
GIT binary patch
delta 472
zcmV;}0Vn>=1CIod83+Ub006Ymd(x3EEPvey91aaSG53r@0004?Nkl<ZNXN~VTW-T3
z5Je9Rwv(vpZn~6iq6^9<y1S}s6URV57-NVd1y}h9mI99P(Y$;I6C)287M=*>%A0sK
z-yY^_E-+Dl0}%4vZGgcRZkPoV6%h$|o#P5*6k)IkQP&YuS`+Zq6^JWL0xTEU(tjEh
zGV#f|DWn7Mx{}hVh-YHt%tsUE$f${qfWak)0-j5wC25>77zBeXPI){drwy1B7Qw4i
zHbv$?)?Dxe!h%_1(>_KfJW=y$Q+3RlY9Eu9MfFXky4i{exw33o#eM_ESC#%)p-7<$
z8(s`KyjRvlwg_Rp`?=Kb@fcId;(xtS@3zaIW|L`F-zhM&Jjw=)sPdWG8jI9z;%-Zk
zETI{bG<GXSav0nk7s1gpaBS4#9*5-kxMYh(=oon8i*J7TW#q!7m73a!qoZffffrsG
z=n$;h<K}<~y?(PDJ4Qx4zQUwEJ$v>X*wJf~VX-D6bXnyGrb<tYHaEek>qWb@H7RY9
zGuCBgixtM?M0E6Y>)4bXS?HU)W|gV3y-RZsx4PD6<!S5w!Q|GV1mF)x+Nrn^N}qE8
O0000<MNUMnLSTYo%GwzK

delta 405
zcmV;G0c!q_1kD4G85IBk0029(?1caT00DDSM?wIu&K&8HAuNB~1rQJ!AdQ)Xy8r+I
zQAtEWR5;7Mlu>TuFbqUzNLfybqPOW$dWjw=m+0*li?(r0PCq0YL8EMc79}7UmLJ9x
zITVE-!|;1d=}+~w2m9I>0ZOEHi~tSRu>wF)DkGI@5J984XcRY{j25ZJ(A?eKVVe#z
zVtqS*Pj!9);EjKg6zg(+{mz^gzyzWI$c)Q*aON}V^!~4i<#WJ%nuqrq-qpE8W@B1D
z17=x6Qtw4ZtOI6^$h}|6J4|Y01Z51E=yh*8QVy7ubma|=?6__IXCIP-Z`-D|7moCd
zjk0bjA24nNcOCOG^19ou1M@qKTlYLkFLgfM_^=iyyPtK<e43yC{C)peE~@~RsU9C5
zpXSNUHb1-96sE(nL<pdJt;gfTp}KGLW%5a2nb+27nwL`N!<7y}2WZpUhle!xGS%rS
zpH?KVxAV21tIe(7&Z)80hx*67vtJGR`QG>f-omQ5O$$k800000NkvXXu0mjf{UE;4

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1797b88bb61f..55e1952a38a0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5988,9 +5988,9 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx&
     // Right shadow & corners
     if ( bPaintRightShadow )
     {
-        pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right() + 1, aPagePxRect.Bottom() + 1 - (aPageBottomRightShadow.GetSizePixel().Height() - mnShadowPxWidth) ) ),
+        pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right(), aPagePxRect.Bottom() + 1 - (aPageBottomRightShadow.GetSizePixel().Height() - mnShadowPxWidth) ) ),
             aPageBottomRightShadow );
-        pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right() + 1, aPagePxRect.Top() - mnShadowPxWidth ) ),
+        pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right(), aPagePxRect.Top() - mnShadowPxWidth ) ),
             aPageTopRightShadow );
 
         if ( aPagePxRect.Height() > 2 * mnShadowPxWidth)
@@ -6021,7 +6021,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx&
 
     BitmapEx aPageBottomShadow = aPageBottomShadowBase;
     aPageBottomShadow.Scale( aPaintRect.Width(), 1 );
-    lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 1 ),
+    lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 2 ),
                              aPageBottomShadow, BOTTOM );
     BitmapEx aPageTopShadow = aPageTopShadowBase;
     aPageTopShadow.Scale( aPaintRect.Width(), 1 );