]> source.dussan.org Git - poi.git/commitdiff
revert previous commit
authorMaxim Valyanskiy <maxcom@apache.org>
Thu, 14 Jan 2010 09:22:39 +0000 (09:22 +0000)
committerMaxim Valyanskiy <maxcom@apache.org>
Thu, 14 Jan 2010 09:22:39 +0000 (09:22 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@899129 13f79535-47bb-0310-9956-ffa450edef68

src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java

index 394313cdca431f0d991256ad5513487bc95765ee..24a2632be682630d1df38089494df588e3b39a33 100644 (file)
 ==================================================================== */
 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");
        }