Author: kiwiwings
Date: Mon Jul 24 05:39:33 2017
New Revision: 1802751
URL: http://svn.apache.org/viewvc?rev=1802751&view=rev
Log:
Fonts bugfix
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java?rev=1802751&r1=1802750&r2=1802751&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java Mon
Jul 24 05:39:33 2017
@@ -848,7 +848,7 @@ public class XSLFTextRun implements Text
}
// SYMBOL is missing
- if (font != null || !font.isSetTypeface() ||
"".equals(font.getTypeface())) {
+ if (font == null || !font.isSetTypeface() ||
"".equals(font.getTypeface())) {
font = coll.getLatin();
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java?rev=1802751&r1=1802750&r2=1802751&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java Mon Jul 24
05:39:33 2017
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
