You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/06/23 23:13:15 UTC
svn commit: r1861958 - in /poi/trunk/src:
java/org/apache/poi/sl/draw/DrawPaint.java
ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
Author: kiwiwings
Date: Sun Jun 23 23:13:15 2019
New Revision: 1861958
URL: http://svn.apache.org/viewvc?rev=1861958&view=rev
Log:
fix rendering of xslf shapes with no/external blip part
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java?rev=1861958&r1=1861957&r2=1861958&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java Sun Jun 23 23:13:15 2019
@@ -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);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java?rev=1861958&r1=1861957&r2=1861958&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java Sun Jun 23 23:13:15 2019
@@ -428,6 +428,9 @@ public abstract class XSLFShape implemen
@Override
public String getContentType() {
+ if (blip == null || !blip.isSetEmbed() || blip.getEmbed().isEmpty()) {
+ return null;
+ }
/* TOOD: map content-type */
return getPart().getContentType();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org