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

revert previous commit 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@899129 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maxim Valyanskiy 2010-01-14 09:22:39 +00:00
parent 4e3c970131
commit 2956525db2
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
View File

@ -16,7 +16,13 @@
==================================================================== */
package org.apache.poi.extractor;
import java.io.*;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
import java.util.ArrayList;
import java.util.Iterator;
@ -24,8 +30,6 @@ import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.POITextExtractor;
import org.apache.poi.POIXMLDocument;
import org.apache.poi.POIXMLTextExtractor;
import org.apache.poi.util.TempFile;
import org.apache.poi.util.IOUtils;
import org.apache.poi.hdgf.extractor.VisioTextExtractor;
import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
import org.apache.poi.hslf.extractor.PowerPointExtractor;
@ -83,22 +87,9 @@ public class ExtractorFactory {
if(POIFSFileSystem.hasPOIFSHeader(inp)) {
return createExtractor(new POIFSFileSystem(inp));
}
if(POIXMLDocument.hasOOXMLHeader(inp)) {
File file = TempFile.createTempFile("poi-ooxml-", ".tmp");
try {
FileOutputStream out = new FileOutputStream(file);
IOUtils.copy(inp, out);
out.close();
return createExtractor(OPCPackage.open(file.getPath()));
} finally {
if (file.exists()) {
file.delete();
}
}
}
return createExtractor(OPCPackage.open(inp));
}
throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
}