Fonts bugfix

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1802751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2017-07-24 05:39:33 +00:00
parent 2325cdb9e6
commit 08b03d9547
2 changed files with 2 additions and 2 deletions

View File

@ -848,7 +848,7 @@ public class XSLFTextRun implements TextRun {
} }
// SYMBOL is missing // SYMBOL is missing
if (font != null || !font.isSetTypeface() || "".equals(font.getTypeface())) { if (font == null || !font.isSetTypeface() || "".equals(font.getTypeface())) {
font = coll.getLatin(); font = coll.getLatin();
} }
} }

View File

@ -72,7 +72,7 @@ public class TestFonts {
private static final String INIT_FONTS[] = { "mona.ttf" }; private static final String INIT_FONTS[] = { "mona.ttf" };
// currently linux and mac return quite different values // currently linux and mac return quite different values
private static final int[] expected_sizes = { 311, 312, 313, private static final int[] expected_sizes = { 311, 312, 313, 318,
362, // Windows 10, 13.3" 1080p high-dpi 362, // Windows 10, 13.3" 1080p high-dpi
398, 399, 398, 399,
406 // Ubuntu Trusty, 15", 1680x1050 406 // Ubuntu Trusty, 15", 1680x1050