[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Noel Power]

 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e497a5620f3865cfcb07446692a6f1e12ff14370
Author: Noel Power <noel.power at suse.com>
Date:   Tue Jun 25 14:40:45 2013 +0100

    fix text position for custom shapes with zoom != 100% fdo#59862
    
    custom shapes that had text suffered from strange display at zoom
    levels != 100%, this was because there was a bug in the code to
    correct the textposition
    
    Change-Id: I8d1817cc6be91b3e6379200eb21eb2966d3c2aa9
    (cherry picked from commit 443c13e92c6f900a41e6e383684623ead3e088f5)
    Reviewed-on: https://gerrit.libreoffice.org/4514
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 654ed86..7aa29cb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -46,9 +46,11 @@ namespace sdr
 
         basegfx::B2DRange ViewContactOfSdrObjCustomShape::getCorrectedTextBoundRect() const
         {
-            const Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+            Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+            aObjectBound += GetCustomShapeObj().GetGridOffset();
             Rectangle aTextBound(aObjectBound);
             GetCustomShapeObj().GetTextBounds(aTextBound);
+            aTextBound += GetCustomShapeObj().GetGridOffset();
             basegfx::B2DRange aTextRange(aTextBound.Left(), aTextBound.Top(), aTextBound.Right(), aTextBound.Bottom());
             const basegfx::B2DRange aObjectRange(aObjectBound.Left(), aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom());