sdext/source/presenter/PresenterTheme.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6af9bba906e4c2a1602a3cbc50df874808417491
Author: Caolán McNamara <caol...@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/42328
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sdext/source/presenter/PresenterTheme.cxx
b/sdext/source/presenter/PresenterTheme.cxx
index 3836838c72d9..cf62207860ae 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -557,6 +557,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
