Author: maxcom
Date: Thu Jan 14 09:22:39 2010
New Revision: 899129
URL: http://svn.apache.org/viewvc?rev=899129&view=rev
Log:
revert previous commit
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java?rev=899129&r1=899128&r2=899129&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java Thu
Jan 14 09:22:39 2010
@@ -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.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 @@
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");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
