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

Caolán McNamara caolanm at redhat.com
Wed Jan 3 15:57:01 UTC 2018


 lotuswordpro/source/filter/lwpoleobject.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cef68d0ce9a3f5f4a040fd3cd63ce7d63b241ac9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 3 13:31:16 2018 +0000

    ofz#4901 Divide-by-zero
    
    Change-Id: Ifc38234b4a99b205681b18b0d0bd2ec2a65dc515
    Reviewed-on: https://gerrit.libreoffice.org/47317
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 1e0a00e54e77..66cee7b776e6 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -154,7 +154,7 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & fWidth, double & fHeight)
                     fSclGrafWidth = fWidth;
                     fSclGrafHeight = fHeight;
                 }
-                else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO)
+                else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO && fHeight != 0.0 && fDisFrameHeight != 0.0)
                 {
                     if (fWidth/fHeight >= fDisFrameWidth/fDisFrameHeight)
                     {


More information about the Libreoffice-commits mailing list