You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2010/09/28 17:29:01 UTC
svn commit: r1002216 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
Author: nick
Date: Tue Sep 28 15:29:01 2010
New Revision: 1002216
URL: http://svn.apache.org/viewvc?rev=1002216&view=rev
Log:
Not all XWPFParagraphs have the root document, so check for this to avoid a NPE (TIKA-506)
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java?rev=1002216&r1=1002215&r2=1002216&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java Tue Sep 28 15:29:01 2010
@@ -158,10 +158,12 @@ public class XWPFWordExtractorDecorator
// If we have any pictures, output them
for(XWPFPicture picture : run.getEmbeddedPictures()) {
- XWPFPictureData data = picture.getPictureData();
- if(data != null) {
- xhtml.startElement("img", "src", "embedded:" + data.getFileName());
- xhtml.endElement("img");
+ if(paragraph.getDocument() != null) {
+ XWPFPictureData data = picture.getPictureData();
+ if(data != null) {
+ xhtml.startElement("img", "src", "embedded:" + data.getFileName());
+ xhtml.endElement("img");
+ }
}
}
}