moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Patch from Yury from bug #45018 - Support for fetching embeded documents from within an OOXML files

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@659564 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-05-23 15:05:12 +00:00
parent df9f6ef296
commit 829cdf330f
6 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.xml
View File

@ -562,6 +562,7 @@ under the License.
<uptodate property="main.test.notRequired" targetfile="${main.testokfile}">
<srcfiles dir="${main.src}"/>
<srcfiles dir="${main.src.test}"/>
<srcfiles dir="${ooxml.src}"/>
</uptodate>
</target>

1
src/documentation/content/xdocs/changes.xml
View File

@ -37,6 +37,7 @@
<!-- Don't forget to update status.xml too! -->
<release version="3.5.1-alpha1" date="2008-04-??">
<action dev="POI-DEVELOPERS" type="add">45018 - Support for fetching embeded documents from within an OOXML file</action>
<action dev="POI-DEVELOPERS" type="add">Port support for setting a policy on missing / blank cells when fetching, to XSSF too</action>
<action dev="POI-DEVELOPERS" type="add">Common text extraction factory, which returns the correct POITextExtractor for the supplied data</action>
<action dev="POI-DEVELOPERS" type="add">Text Extraction support for the new OOXML files (.xlsx, .docx and .pptx)</action>

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.5.1-alpha1" date="2008-04-??">
<action dev="POI-DEVELOPERS" type="add">45018 - Support for fetching embeded documents from within an OOXML file</action>
<action dev="POI-DEVELOPERS" type="add">Port support for setting a policy on missing / blank cells when fetching, to XSSF too</action>
<action dev="POI-DEVELOPERS" type="add">Common text extraction factory, which returns the correct POITextExtractor for the supplied data</action>
<action dev="POI-DEVELOPERS" type="add">Text Extraction support for the new OOXML files (.xlsx, .docx and .pptx)</action>

22
src/ooxml/java/org/apache/poi/POIXMLDocument.java
View File

@ -19,6 +19,8 @@ package org.apache.poi;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
import java.util.LinkedList;
import java.util.List;
import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IOUtils;
@ -39,6 +41,8 @@ public abstract class POIXMLDocument {
public static final String EXTENDED_PROPERTIES_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
public static final String OLE_OBJECT_REL_TYPE="http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
/** The OPC Package */
private Package pkg;
@ -50,6 +54,10 @@ public abstract class POIXMLDocument {
*/
private POIXMLProperties properties;
/**
* The embedded OLE2 files in the OPC package
*/
private List<PackagePart> embedds;
protected POIXMLDocument() {}
@ -62,6 +70,12 @@ public abstract class POIXMLDocument {
// Get core part
this.corePart = this.pkg.getPart(coreDocRelationship);
// Get any embedded OLE2 documents
this.embedds = new LinkedList<PackagePart>();
for(PackageRelationship rel : corePart.getRelationshipsByType(OLE_OBJECT_REL_TYPE)) {
embedds.add(getTargetPart(rel));
}
} catch (OpenXML4JException e) {
throw new IOException(e.toString());
}
@ -190,4 +204,12 @@ public abstract class POIXMLDocument {
}
return properties;
}
/**
* Get the document's embedded files.
*/
public List<PackagePart> getAllEmbedds() throws OpenXML4JException
{
return embedds;
}
}

7
src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
View File

@ -47,4 +47,11 @@ public abstract class POIXMLTextExtractor extends POITextExtractor {
public ExtendedProperties getExtendedProperties() throws IOException, OpenXML4JException, XmlException {
return document.getProperties().getExtendedProperties();
}
/**
* Returns opened document
*/
public POIXMLDocument getDocument(){
return document;
}
}

2
src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
View File

@ -58,7 +58,7 @@ public class XWPFWordExtractor extends POIXMLTextExtractor {
public static void main(String[] args) throws Exception {
if(args.length < 1) {
System.err.println("Use:");
System.err.println(" HXFWordExtractor <filename.xlsx>");
System.err.println(" HXFWordExtractor <filename.docx>");
System.exit(1);
}
POIXMLTextExtractor extractor =