[Libreoffice-commits] core.git: drawinglayer/source

Caolán McNamara caolanm at redhat.com
Tue Jan 30 15:20:19 UTC 2018


 drawinglayer/source/primitive2d/textprimitive2d.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c46d7f2556aa726d531d8afca7c181ba430900b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 30 09:17:44 2018 +0000

    ofz#5822 Divide-by-zero
    
    Change-Id: Ibfffd57f74b579f869115ad961aa2ec9b35faca3
    Reviewed-on: https://gerrit.libreoffice.org/48889
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index adc0ecaad385..d155e75c46cc 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -95,7 +95,7 @@ namespace drawinglayer
 
                 // if decomposition returns false, create no geometry since e.g. scaling may
                 // be zero
-                if(getTextTransform().decompose(aScale, aTranslate, fRotate, fShearX))
+                if (getTextTransform().decompose(aScale, aTranslate, fRotate, fShearX) && aScale.getX() != 0.0)
                 {
                     // handle special case: If scale is negative in (x,y) (3rd quadrant), it can
                     // be expressed as rotation by PI


More information about the Libreoffice-commits mailing list