Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add null check in XLSFPictureShape 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1849069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-12-17 09:17:29 +00:00
parent 9f7520e86f
commit bb7ffebe0f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
View File

@ -265,28 +265,28 @@ public class XSLFPictureShape extends XSLFSimpleShape
public XSLFPictureData getSvgImage() {
CTBlip blip = getBlip();
CTOfficeArtExtensionList extLst = blip.getExtLst();
if (extLst == null) {
return null;
}
if (blip != null) {
CTOfficeArtExtensionList extLst = blip.getExtLst();
if (extLst == null) {
return null;
}
int size = extLst.sizeOfExtArray();
for (int i=0; i<size; i++) {
XmlCursor cur = extLst.getExtArray(i).newCursor();
try {
if (cur.toChild(SVG_NS, "svgBlip")) {
String svgRelId = cur.getAttributeText(new QName(CORE_PROPERTIES_ECMA376_NS, "embed"));
return (svgRelId != null) ? (XSLFPictureData)getSheet().getRelationById(svgRelId) : null;
int size = extLst.sizeOfExtArray();
for (int i = 0; i < size; i++) {
XmlCursor cur = extLst.getExtArray(i).newCursor();
try {
if (cur.toChild(SVG_NS, "svgBlip")) {
String svgRelId = cur.getAttributeText(new QName(CORE_PROPERTIES_ECMA376_NS, "embed"));
return (svgRelId != null) ? (XSLFPictureData) getSheet().getRelationById(svgRelId) : null;
}
} finally {
cur.dispose();
}
} finally {
cur.dispose();
}
}
return null;
}
/**
* Convienence method for adding SVG images, which generates the preview image
* @param sheet the sheet to add