]> source.dussan.org Git - poi.git/commitdiff
60184 - invalid OOXML produced when XSSFFont.getFamily() called with no families...
authorGreg Woolsey <gwoolsey@apache.org>
Fri, 5 May 2017 21:50:59 +0000 (21:50 +0000)
committerGreg Woolsey <gwoolsey@apache.org>
Fri, 5 May 2017 21:50:59 +0000 (21:50 +0000)
Fix to stop creating an empty family when none exist, just use the existing logic to return NOT_APPLICABLE.  Creating the empty element produces XML that doesn't comply with the XSD.

Alternative would have been to set the family int value for the new family, but this way checking the value doesn't change the output, which is my preferred behavior.  No quantum effects!

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1794111 13f79535-47bb-0310-9956-ffa450edef68

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java

index bdbbf747829738b0d9fae5bf296995310b43629a..05b49671a01abf621a68b00710dd020f76400e63 100644 (file)
@@ -598,7 +598,7 @@ public class XSSFFont implements Font {
      * @see org.apache.poi.ss.usermodel.FontFamily
      */
     public int getFamily() {
-        CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? _ctFont.addNewFamily() : _ctFont.getFamilyArray(0);
+        CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? null : _ctFont.getFamilyArray(0);
         return family == null ? FontFamily.NOT_APPLICABLE.getValue() : FontFamily.valueOf(family.getVal()).getValue();
     }