[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/coretext

[Khaled Hosny]

 vcl/coretext/ctlayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 083baaa6d8adb04617035ef23a1c42f8e8903c50
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue Jun 18 06:44:33 2013 +0200

    Fix CTLayout::GetBoundRect()
    
    was broken in 35b0a4cd274c1567cf0b8067eb01f17b82ee9f35
    
    Change-Id: I803b510fc875ff9e48ed762114f6d63dad51ad7a
    (cherry picked from commit 98741a2078ebd0a9c83f6e676f99de526990f423)
    Reviewed-on: https://gerrit.libreoffice.org/4387
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index b3542d9..cbd7e91 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -441,9 +441,9 @@ bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const
 
     // CoreText top-bottom are vertically flipped from a VCL aspect
     rVCLRect.Left()   = aPos.X() + aMacRect.origin.x;
-    rVCLRect.Right()  = aPos.X() + aMacRect.origin.x + aMacRect.size.width;
+    rVCLRect.Right()  = aPos.X() + (aMacRect.origin.x + aMacRect.size.width);
     rVCLRect.Bottom() = aPos.Y() - aMacRect.origin.y;
-    rVCLRect.Top()    = aPos.Y() - aMacRect.origin.y + aMacRect.size.height;
+    rVCLRect.Top()    = aPos.Y() - (aMacRect.origin.y + aMacRect.size.height);
     return true;
 }