]> source.dussan.org Git - poi.git/commitdiff
Fix a NullPointerException that occurs with some PPTs now but did not in POI 3.13
authorDominik Stadler <centic@apache.org>
Wed, 13 Jan 2016 19:45:49 +0000 (19:45 +0000)
committerDominik Stadler <centic@apache.org>
Wed, 13 Jan 2016 19:45:49 +0000 (19:45 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1724487 13f79535-47bb-0310-9956-ffa450edef68

src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt [new file with mode: 0755]

index ceb4853e30899a9a3c25a5d74f6b2223ef2fc05b..5a050f5e135d8ba55737c7dad09eee8eb9ce0777 100644 (file)
@@ -600,8 +600,15 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         boolean hasColor = getFlag(ParagraphFlagsTextProp.BULLET_HARDCOLOR_IDX);\r
         if (tp == null || !hasColor) {\r
             // if bullet color is undefined, return color of first run\r
-            if (_runs.isEmpty()) return null;\r
+            if (_runs.isEmpty()) {\r
+                return null;\r
+            }\r
+            \r
             SolidPaint sp = _runs.get(0).getFontColor();\r
+            if(sp == null) {\r
+                return null;\r
+            }\r
+            \r
             return DrawPaint.applyColorTransform(sp.getSolidColor());\r
         }\r
 \r
diff --git a/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt b/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt
new file mode 100755 (executable)
index 0000000..ead1b49
Binary files /dev/null and b/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt differ