From: Andreas Beeker Date: Mon, 24 Jul 2017 05:39:33 +0000 (+0000) Subject: Fonts bugfix X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=08b03d9547486280b49c9f7942de17246a58a45b;p=poi.git Fonts bugfix git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1802751 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java index d5d57312f2..8124ccff1c 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java @@ -848,7 +848,7 @@ public class XSLFTextRun implements TextRun { } // SYMBOL is missing - if (font != null || !font.isSetTypeface() || "".equals(font.getTypeface())) { + if (font == null || !font.isSetTypeface() || "".equals(font.getTypeface())) { font = coll.getLatin(); } } diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java index 8b5afc5b8a..12be322500 100644 --- a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java +++ b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java @@ -72,7 +72,7 @@ public class TestFonts { private static final String INIT_FONTS[] = { "mona.ttf" }; // 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 398, 399, 406 // Ubuntu Trusty, 15", 1680x1050