[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - svx/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 21 03:25:09 PDT 2012


 svx/source/svdraw/svdoashp.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 350d9f972e00a05ff61140eafc078188252cc2de
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Tue Aug 14 16:12:53 2012 +0530

    fdo#47434: Zero rect. size causing wrong line positions.
    
    Thanks to Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
    for the indepth analysis and debugging.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 1e66287..4359459 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3026,6 +3026,10 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
     // build and set BaseRect (use scale)
     Point aPoint = Point();
     Size aSize(FRound(aScale.getX()), FRound(aScale.getY()));
+    // fdo#47434 We need a valid rectangle here
+    if( !aSize.Height() ) aSize.setHeight( 1 );
+    if( !aSize.Width() ) aSize.setWidth( 1 );
+
     Rectangle aBaseRect(aPoint, aSize);
     SetSnapRect(aBaseRect);
 


More information about the Libreoffice-commits mailing list