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

Caolán McNamara caolanm at redhat.com
Wed Jan 3 18:55:55 UTC 2018


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

New commits:
commit 20a639f34f524fa455382bd31a8c4351bc46e6bb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 3 15:22:21 2018 +0000

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

diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index aaa7f688c6c6..a615e83e79bd 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -510,7 +510,7 @@ void LwpGraphicObject::CreateGrafObject()
                     fSclGrafWidth = fOrgGrafWidth;
                     fSclGrafHeight = fOrgGrafHeight;
                 }
-                else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO)
+                else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO && fOrgGrafHeight != 0.0 && fDisFrameHeight != 0.0)
                 {
                     if (fOrgGrafWidth/fOrgGrafHeight >= fDisFrameWidth/fDisFrameHeight)
                     {


More information about the Libreoffice-commits mailing list