[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sdext/source

[Caolán McNamara]

 sdext/source/presenter/PresenterTheme.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cc369b3447da7f354901a79007b5db6f98379189
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 15 16:17:21 2017 +0100

    Resolves: tdf#112408 crash with nan with bad ascent
    
    bad ascent in the common case is probably fixed with tdf#107249
    
    Change-Id: I0a06de06cb07277c50dcffd1b6a1121398e84e42
    Reviewed-on: https://gerrit.libreoffice.org/42329
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 10c7cf023482..5e60dde66bd2 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -570,6 +570,9 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize (
     geometry::RealRectangle2D aBox (PresenterCanvasHelper::GetTextBoundingBox (xFont, "X"));
 
     const double nAscent (-aBox.Y1);
+    //tdf#112408
+    if (nAscent == 0)
+        return nDesignSize;
     const double nDescent (aBox.Y2);
     const double nScale = (nAscent+nDescent) / nAscent;
     return nDesignSize * nScale;