From: Andreas Beeker <kiwiwings@apache.org>
Date: Sun, 23 Jun 2019 23:13:15 +0000 (+0000)
Subject: fix rendering of xslf shapes with no/external blip part
X-Git-Tag: REL_4_1_1~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd6d090969def01c15b0cb6a9f8da37472a45a2c;p=poi.git

fix rendering of xslf shapes with no/external blip part

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

diff --git a/src/java/org/apache/poi/sl/draw/DrawPaint.java b/src/java/org/apache/poi/sl/draw/DrawPaint.java
index fea1da4661..ea5e2ad39c 100644
--- a/src/java/org/apache/poi/sl/draw/DrawPaint.java
+++ b/src/java/org/apache/poi/sl/draw/DrawPaint.java
@@ -237,6 +237,9 @@ public class DrawPaint {
         assert(graphics != null);
 
         final String contentType = fill.getContentType();
+        if (contentType == null || contentType.isEmpty()) {
+            return TRANSPARENT;
+        }
 
         ImageRenderer renderer = DrawPictureShape.getImageRenderer(graphics, contentType);
 
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
index 8b056847b8..f9d58b8e5b 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
@@ -428,6 +428,9 @@ public abstract class XSLFShape implements Shape<XSLFShape,XSLFTextParagraph> {
 
             @Override
             public String getContentType() {
+                if (blip == null || !blip.isSetEmbed() || blip.getEmbed().isEmpty()) {
+                    return null;
+                }
                 /* TOOD: map content-type */
                 return getPart().getContentType();
             }