import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
this.directory = dir;
}
- protected POIDocument(POIFSFileSystem fs) {
+ /**
+ * Constructs from an old-style OPOIFS
+ */
+ protected POIDocument(OPOIFSFileSystem fs) {
this(fs.getRoot());
}
-
+ /**
+ * Constructs from an old-style OPOIFS
+ */
protected POIDocument(NPOIFSFileSystem fs) {
this(fs.getRoot());
}
+ /**
+ * Constructs from the default POIFS
+ */
+ protected POIDocument(POIFSFileSystem fs) {
+ this(fs.getRoot());
+ }
/**
* Fetch the Document Summary Information of the document
import org.apache.poi.POIDocument;
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
/**
public HPSFPropertiesOnlyDocument(NPOIFSFileSystem fs) {
super(fs.getRoot());
}
+ public HPSFPropertiesOnlyDocument(OPOIFSFileSystem fs) {
+ super(fs);
+ }
public HPSFPropertiesOnlyDocument(POIFSFileSystem fs) {
super(fs);
}
import org.apache.poi.hssf.record.EscherAggregate;\r
import org.apache.poi.hssf.usermodel.HSSFPatriarch;\r
import org.apache.poi.hssf.usermodel.HSSFWorkbook;\r
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;\r
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
\r
/**\r
* Utility for representing drawings contained in a binary Excel file as a XML tree\r
}\r
\r
public static void writeToFile(OutputStream fos, InputStream xlsWorkbook, boolean excludeWorkbookRecords, String[] params) throws IOException {\r
- POIFSFileSystem fs = new POIFSFileSystem(xlsWorkbook);\r
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(xlsWorkbook);\r
HSSFWorkbook workbook = new HSSFWorkbook(fs);\r
InternalWorkbook internalWorkbook = getInternalWorkbook(workbook);\r
DrawingGroupRecord r = (DrawingGroupRecord) internalWorkbook.findFirstRecordBySid(DrawingGroupRecord.sid);\r
package org.apache.poi.hssf.dev;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.RecordInputStream.LeftoverDataException;
-import org.apache.poi.hssf.record.chart.*;
+import org.apache.poi.hssf.record.chart.AreaFormatRecord;
+import org.apache.poi.hssf.record.chart.AreaRecord;
+import org.apache.poi.hssf.record.chart.AxisLineFormatRecord;
+import org.apache.poi.hssf.record.chart.AxisOptionsRecord;
+import org.apache.poi.hssf.record.chart.AxisParentRecord;
+import org.apache.poi.hssf.record.chart.AxisRecord;
+import org.apache.poi.hssf.record.chart.AxisUsedRecord;
+import org.apache.poi.hssf.record.chart.BarRecord;
+import org.apache.poi.hssf.record.chart.BeginRecord;
+import org.apache.poi.hssf.record.chart.CatLabRecord;
+import org.apache.poi.hssf.record.chart.CategorySeriesAxisRecord;
+import org.apache.poi.hssf.record.chart.ChartEndBlockRecord;
+import org.apache.poi.hssf.record.chart.ChartEndObjectRecord;
+import org.apache.poi.hssf.record.chart.ChartFRTInfoRecord;
+import org.apache.poi.hssf.record.chart.ChartFormatRecord;
+import org.apache.poi.hssf.record.chart.ChartRecord;
+import org.apache.poi.hssf.record.chart.ChartStartBlockRecord;
+import org.apache.poi.hssf.record.chart.ChartStartObjectRecord;
+import org.apache.poi.hssf.record.chart.DatRecord;
+import org.apache.poi.hssf.record.chart.DataFormatRecord;
+import org.apache.poi.hssf.record.chart.DefaultDataLabelTextPropertiesRecord;
+import org.apache.poi.hssf.record.chart.EndRecord;
+import org.apache.poi.hssf.record.chart.FontBasisRecord;
+import org.apache.poi.hssf.record.chart.FontIndexRecord;
+import org.apache.poi.hssf.record.chart.FrameRecord;
+import org.apache.poi.hssf.record.chart.LegendRecord;
+import org.apache.poi.hssf.record.chart.LineFormatRecord;
+import org.apache.poi.hssf.record.chart.LinkedDataRecord;
+import org.apache.poi.hssf.record.chart.ObjectLinkRecord;
+import org.apache.poi.hssf.record.chart.PlotAreaRecord;
+import org.apache.poi.hssf.record.chart.PlotGrowthRecord;
+import org.apache.poi.hssf.record.chart.SeriesIndexRecord;
+import org.apache.poi.hssf.record.chart.SeriesListRecord;
+import org.apache.poi.hssf.record.chart.SeriesRecord;
+import org.apache.poi.hssf.record.chart.SeriesTextRecord;
+import org.apache.poi.hssf.record.chart.SeriesToChartGroupRecord;
+import org.apache.poi.hssf.record.chart.SheetPropertiesRecord;
+import org.apache.poi.hssf.record.chart.TextRecord;
+import org.apache.poi.hssf.record.chart.TickRecord;
+import org.apache.poi.hssf.record.chart.UnitsRecord;
+import org.apache.poi.hssf.record.chart.ValueRangeRecord;
import org.apache.poi.hssf.record.pivottable.DataItemRecord;
import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
import org.apache.poi.hssf.record.pivottable.PageItemRecord;
import org.apache.poi.hssf.record.pivottable.ViewFieldsRecord;
import org.apache.poi.hssf.record.pivottable.ViewSourceRecord;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndian;
protected static InputStream getPOIFSInputStream(File file)
throws IOException, FileNotFoundException {
- POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(new FileInputStream(file));
String workbookName = HSSFWorkbook.getWorkbookDirEntryName(fs.getRoot());
return fs.createDocumentInputStream(workbookName);
}
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.usermodel.Chart;
import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.Drawing;
public HSSFWorkbook(POIFSFileSystem fs) throws IOException {
this(fs,true);
}
+ /**
+ * Given a POI POIFSFileSystem object, read in its Workbook along
+ * with all related nodes, and populate the high and low level models.
+ * <p>This calls {@link #HSSFWorkbook(POIFSFileSystem, boolean)} with
+ * preserve nodes set to true.
+ *
+ * @see #HSSFWorkbook(POIFSFileSystem, boolean)
+ * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
+ * @exception IOException if the stream cannot be read
+ */
+ public HSSFWorkbook(NPOIFSFileSystem fs) throws IOException {
+ this(fs.getRoot(),true);
+ }
/**
* Given a POI POIFSFileSystem object, read in its Workbook and populate
public HSSFWorkbook(InputStream s, boolean preserveNodes)
throws IOException
{
- this(new POIFSFileSystem(s), preserveNodes);
+ this(new NPOIFSFileSystem(s).getRoot(), preserveNodes);
}
/**
throws IOException {
// check if we were created by POIFS otherwise create a new dummy POIFS for storing the package data
if (directory == null) {
- directory = new POIFSFileSystem().getRoot();
+ directory = new NPOIFSFileSystem().getRoot();
preserveNodes = true;
}
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
public abstract class Decryptor {
public InputStream getDataStream(NPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
return getDataStream(fs.getRoot());
}
-
+ public InputStream getDataStream(OPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
+ return getDataStream(fs.getRoot());
+ }
public InputStream getDataStream(POIFSFileSystem fs) throws IOException, GeneralSecurityException {
return getDataStream(fs.getRoot());
}
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
public EncryptionInfo(POIFSFileSystem fs) throws IOException {
this(fs.getRoot());
}
+ /**
+ * Opens for decryption
+ */
+ public EncryptionInfo(OPOIFSFileSystem fs) throws IOException {
+ this(fs.getRoot());
+ }
/**
* Opens for decryption
*/
\r
import org.apache.poi.poifs.filesystem.DirectoryNode;\r
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;\r
import org.apache.poi.poifs.filesystem.POIFSFileSystem;\r
\r
public abstract class Encryptor {\r
public OutputStream getDataStream(NPOIFSFileSystem fs) throws IOException, GeneralSecurityException {\r
return getDataStream(fs.getRoot());\r
}\r
-\r
+ public OutputStream getDataStream(OPOIFSFileSystem fs) throws IOException, GeneralSecurityException {\r
+ return getDataStream(fs.getRoot());\r
+ }\r
public OutputStream getDataStream(POIFSFileSystem fs) throws IOException, GeneralSecurityException {\r
return getDataStream(fs.getRoot());\r
}\r
import org.apache.poi.poifs.filesystem.DirectoryNode;\r
import org.apache.poi.poifs.filesystem.DocumentInputStream;\r
import org.apache.poi.poifs.filesystem.DocumentNode;\r
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;\r
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
import org.apache.poi.util.BitField;\r
import org.apache.poi.util.BitFieldFactory;\r
import org.apache.poi.util.BoundedInputStream;\r
@SuppressWarnings("unused")\r
public InputStream getDataStream(DirectoryNode dir)\r
throws IOException, GeneralSecurityException {\r
- POIFSFileSystem fsOut = new POIFSFileSystem();\r
+ NPOIFSFileSystem fsOut = new NPOIFSFileSystem();\r
DocumentNode es = (DocumentNode) dir.getEntry("EncryptedSummary");\r
DocumentInputStream dis = dir.createDocumentInputStream(es);\r
ByteArrayOutputStream bos = new ByteArrayOutputStream();\r
sbis = null;\r
bos.reset();\r
fsOut.writeFilesystem(bos);\r
+ fsOut.close();\r
_length = bos.size();\r
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());\r
return bis;\r
import java.util.Iterator;
/**
- *
* Dump internal structure of a OLE2 file into file system
- *
- * @author Yegor Kozlov
*/
public class POIFSDump {
for (int i = 0; i < args.length; i++) {
System.out.println("Dumping " + args[i]);
FileInputStream is = new FileInputStream(args[i]);
- POIFSFileSystem fs = new POIFSFileSystem(is);
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(is);
is.close();
DirectoryEntry root = fs.getRoot();
package org.apache.poi.poifs.dev;
-import java.io.FileInputStream;
+import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
/**
* A simple viewer for POIFS files
try
{
POIFSViewable fs =
- new POIFSFileSystem(new FileInputStream(filename));
- List<String> strings = POIFSViewEngine.inspectViewable(fs, true,
+ new NPOIFSFileSystem(new File(filename));
+ List<String> strings = POIFSViewEngine.inspectViewable(fs, true,
0, " ");
- Iterator<String> iter = strings.iterator();
+ Iterator<String> iter = strings.iterator();
while (iter.hasNext())
{
if(documentNode.getDocument() != null) {
delegate = new ODocumentInputStream(document);
- } else if(parentNode.getFileSystem() != null) {
+ } else if(parentNode.getOFileSystem() != null) {
delegate = new ODocumentInputStream(document);
} else if(parentNode.getNFileSystem() != null) {
delegate = new NDocumentInputStream(document);
return (signature.get() == HeaderBlockConstants._signature);
}
+ /**
+ * Checks if the supplied first 8 bytes of a stream / file
+ * has a POIFS (OLE2) header.
+ */
+ public static boolean hasPOIFSHeader(byte[] header8Bytes) {
+ LongField signature = new LongField(HeaderBlockConstants._signature_offset, header8Bytes);
+ return (signature.get() == HeaderBlockConstants._signature);
+ }
+
/**
* Read and process the PropertiesTable and the
* FAT / XFAT blocks, so that we're ready to
import java.io.OutputStream;
import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.poifs.storage.BlockWritable;
import org.apache.poi.poifs.storage.HeaderBlock;
import org.apache.poi.poifs.storage.PropertyBlock;
import java.io.FilterInputStream;
import java.io.InputStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
/**
* A wrapper around an {@link InputStream}, which
* ignores close requests made to it.
package org.apache.poi.util;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-import java.io.FileInputStream;
-import java.io.IOException;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
/**
* Dump out the aggregated escher records
{
public static void main( String[] args ) throws IOException
{
- POIFSFileSystem fs =
- new POIFSFileSystem(new FileInputStream(args[0]));
+ NPOIFSFileSystem fs =
+ new NPOIFSFileSystem(new File(args[0]));
HSSFWorkbook wb = new HSSFWorkbook(fs);
try {
System.out.println( "Drawing group:" );
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 org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.Entry;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NotOLE2FileException;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.xslf.XSLFSlideShow;
import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
public static POITextExtractor createExtractor(File f) throws IOException, InvalidFormatException, OpenXML4JException, XmlException {
InputStream inp = null;
try {
- inp = new PushbackInputStream(
- new FileInputStream(f), 8);
-
- if(POIFSFileSystem.hasPOIFSHeader(inp)) {
- return createExtractor(new POIFSFileSystem(inp));
- }
- if(POIXMLDocument.hasOOXMLHeader(inp)) {
+ try {
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(f);
+ return createExtractor(fs);
+ } catch (OfficeXmlFileException e) {
return createExtractor(OPCPackage.open(f.toString(), PackageAccess.READ));
+ } catch (NotOLE2FileException ne) {
+ throw new IllegalArgumentException("Your File was neither an OLE2 file, nor an OOXML file");
}
- throw new IllegalArgumentException("Your File was neither an OLE2 file, nor an OOXML file");
} finally {
if(inp != null) inp.close();
}
inp = new PushbackInputStream(inp, 8);
}
- if(POIFSFileSystem.hasPOIFSHeader(inp)) {
- return createExtractor(new POIFSFileSystem(inp));
+ if(NPOIFSFileSystem.hasPOIFSHeader(inp)) {
+ return createExtractor(new NPOIFSFileSystem(inp));
}
if(POIXMLDocument.hasOOXMLHeader(inp)) {
return createExtractor(OPCPackage.open(inp));
// Only ever an OLE2 one from the root of the FS
return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
}
-
- /**
- * @deprecated Use {@link #createExtractor(DirectoryNode)} instead
- */
- @Deprecated
- public static POITextExtractor createExtractor(DirectoryNode poifsDir, POIFSFileSystem fs)
- throws IOException, InvalidFormatException, OpenXML4JException, XmlException
- {
- return createExtractor(poifsDir);
- }
+ public static POIOLE2TextExtractor createExtractor(NPOIFSFileSystem fs) throws IOException, InvalidFormatException, OpenXML4JException, XmlException {
+ // Only ever an OLE2 one from the root of the FS
+ return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
+ }
+ public static POIOLE2TextExtractor createExtractor(OPOIFSFileSystem fs) throws IOException, InvalidFormatException, OpenXML4JException, XmlException {
+ // Only ever an OLE2 one from the root of the FS
+ return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
+ }
public static POITextExtractor createExtractor(DirectoryNode poifsDir) throws IOException,
InvalidFormatException, OpenXML4JException, XmlException
byte[] header8 = IOUtils.peekFirst8Bytes(inp);
// Try to create
- if (POIFSFileSystem.hasPOIFSHeader(header8)) {
+ if (NPOIFSFileSystem.hasPOIFSHeader(header8)) {
NPOIFSFileSystem fs = new NPOIFSFileSystem(inp);
return create(fs, password);
}
package org.apache.poi.hdgf.dev;
-import java.io.FileInputStream;
+import java.io.File;
import org.apache.poi.hdgf.HDGFDiagram;
import org.apache.poi.hdgf.chunks.Chunk;
import org.apache.poi.hdgf.streams.ChunkStream;
import org.apache.poi.hdgf.streams.PointerContainingStream;
import org.apache.poi.hdgf.streams.Stream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
/**
* Developer helper class to dump out the pointer+stream structure
}
HDGFDiagram hdgf = new HDGFDiagram(
- new POIFSFileSystem(new FileInputStream(args[0]))
+ new NPOIFSFileSystem(new File(args[0]))
);
System.out.println("Opened " + args[0]);
this(new HDGFDiagram(dir, fs));
}
public VisioTextExtractor(InputStream inp) throws IOException {
- this(new POIFSFileSystem(inp));
+ this(new NPOIFSFileSystem(inp));
}
/**
this(fs.getRoot());
}
public HPBFDocument(InputStream inp) throws IOException {
- this(new POIFSFileSystem(inp));
+ this(new NPOIFSFileSystem(inp));
}
- /**
- * Opens an embedded publisher document,
- * at the given directory.
- * @deprecated Use {@link #HPBFDocument(DirectoryNode)} instead
- */
- @Deprecated
- public HPBFDocument(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
- this(dir);
- }
/**
* Opens an embedded publisher document,
* at the given directory.
import org.apache.poi.ddf.EscherRecord;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.StringUtil;
* constructed.
*/
public final class HPBFDumper {
- private POIFSFileSystem fs;
- public HPBFDumper(POIFSFileSystem fs) {
+ private NPOIFSFileSystem fs;
+ public HPBFDumper(NPOIFSFileSystem fs) {
this.fs = fs;
}
public HPBFDumper(InputStream inp) throws IOException {
- this(new POIFSFileSystem(inp));
+ this(new NPOIFSFileSystem(inp));
}
private static byte[] getData(DirectoryNode dir, String name) throws IOException {
import org.apache.poi.hpbf.HPBFDocument;
import org.apache.poi.hpbf.model.QuillContents;
import org.apache.poi.hpbf.model.qcbits.QCBit;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.HexDump;
/**
doc = hpbfDoc;
qc = doc.getQuillContents();
}
- public PLCDumper(POIFSFileSystem fs) throws IOException {
+ public PLCDumper(NPOIFSFileSystem fs) throws IOException {
this(new HPBFDocument(fs));
}
public PLCDumper(InputStream inp) throws IOException {
- this(new POIFSFileSystem(inp));
+ this(new NPOIFSFileSystem(inp));
}
public static void main(String[] args) throws Exception {
public PublisherTextExtractor(InputStream is) throws IOException {
this(new POIFSFileSystem(is));
}
- @Deprecated
- public PublisherTextExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
- this(new HPBFDocument(dir, fs));
- }
/**
* Should a call to getText() return hyperlinks inline
*/
public HSLFSlideShow(InputStream inputStream) throws IOException {
//do Ole stuff
- this(new POIFSFileSystem(inputStream));
+ this(new NPOIFSFileSystem(inputStream));
}
/**
this(filesystem.getRoot());
}
- /**
- * Constructs a Powerpoint document from a specific point in a
- * POIFS Filesystem. Parses the document and places all the
- * important stuff into data structures.
- *
- * @deprecated Use {@link #HSLFSlideShow(DirectoryNode)} instead
- * @param dir the POIFS directory to read from
- * @param filesystem the POIFS FileSystem to read from
- * @throws IOException if there is a problem while parsing the document.
- */
- @Deprecated
- public HSLFSlideShow(DirectoryNode dir, POIFSFileSystem filesystem) throws IOException
- {
- this(dir);
- }
-
/**
* Constructs a Powerpoint document from a specific point in a
* POIFS Filesystem. Parses the document and places all the
package org.apache.poi.hslf.dev;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import org.apache.poi.hslf.record.RecordTypes;
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.LittleEndian;
/**
protected boolean hexHeader = true;
public PPTXMLDump(File ppt) throws IOException {
- FileInputStream fis = new FileInputStream(ppt);
- POIFSFileSystem fs = new POIFSFileSystem(fis);
- fis.close();
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(ppt);
//read the document entry from OLE file system
DocumentEntry entry = (DocumentEntry)fs.getRoot().getEntry(PPDOC_ENTRY);
package org.apache.poi.hslf.dev;
-import java.io.*;
-
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-
-import org.apache.poi.ddf.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.poi.ddf.DefaultEscherRecordFactory;
+import org.apache.poi.ddf.EscherContainerRecord;
+import org.apache.poi.ddf.EscherRecord;
+import org.apache.poi.ddf.EscherTextboxRecord;
import org.apache.poi.hslf.record.RecordTypes;
-
+import org.apache.poi.poifs.filesystem.DocumentEntry;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.LittleEndian;
/**
* To peek inside PPDrawings, which hold Escher drawings, we use the
* DDF package from POI (but we can fake it by using the Escher listings
* from hslf.record.RecordTypes also)
- *
- * @author Nick Burch
*/
public final class SlideShowDumper {
- private InputStream istream;
- private POIFSFileSystem filesystem;
+ private NPOIFSFileSystem filesystem;
private byte[] _docstream;
*/
public SlideShowDumper(String fileName) throws IOException
{
- this(new FileInputStream(fileName));
+ this(new NPOIFSFileSystem(new File(fileName)));
}
/**
public SlideShowDumper(InputStream inputStream) throws IOException
{
//do Ole stuff
- this(new POIFSFileSystem(inputStream));
- istream = inputStream;
+ this(new NPOIFSFileSystem(inputStream));
}
/**
* @param filesystem the POIFS FileSystem to read from
* @throws IOException if there is a problem while parsing the document.
*/
- public SlideShowDumper(POIFSFileSystem filesystem) throws IOException
+ public SlideShowDumper(NPOIFSFileSystem filesystem) throws IOException
{
this.filesystem = filesystem;
*/
public void close() throws IOException
{
- if(istream != null) {
- istream.close();
- }
- filesystem = null;
+ filesystem.close();
}
package org.apache.poi.hslf.extractor;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
* @param fileName The name of the file to extract from
*/
public PowerPointExtractor(String fileName) throws IOException {
- this(new FileInputStream(fileName));
+ this(new NPOIFSFileSystem(new File(fileName)));
}
/**
* @param iStream The input stream containing the PowerPoint document
*/
public PowerPointExtractor(InputStream iStream) throws IOException {
- this(new POIFSFileSystem(iStream));
+ this(new NPOIFSFileSystem(iStream));
}
/**
this(new HSLFSlideShow(dir));
}
- /**
- * @deprecated Use {@link #PowerPointExtractor(DirectoryNode)} instead
- */
- @Deprecated
- public PowerPointExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
- this(new HSLFSlideShow(dir, fs));
- }
-
/**
* Creates a PowerPointExtractor, from a HSLFSlideShow
*
package org.apache.poi.hslf.extractor;
-import java.io.FileInputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import org.apache.poi.hslf.record.TextCharsAtom;
import org.apache.poi.hslf.record.TextHeaderAtom;
import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.LittleEndian;
/**
* Almost everyone will want to use @see PowerPointExtractor instead. There
* are only a very small number of cases (eg some performance sensitive
* lucene indexers) that would ever want to use this!
- *
- * @author Nick Burch
*/
public final class QuickButCruddyTextExtractor {
- private POIFSFileSystem fs;
+ private NPOIFSFileSystem fs;
private InputStream is;
private byte[] pptContents;
* @param fileName
*/
public QuickButCruddyTextExtractor(String fileName) throws IOException {
- this(new FileInputStream(fileName));
+ this(new NPOIFSFileSystem(new File(fileName)));
}
/**
* @param iStream
*/
public QuickButCruddyTextExtractor(InputStream iStream) throws IOException {
- this(new POIFSFileSystem(iStream));
+ this(new NPOIFSFileSystem(iStream));
is = iStream;
}
* Creates an extractor from a POIFS Filesystem
* @param poifs
*/
- public QuickButCruddyTextExtractor(POIFSFileSystem poifs) throws IOException {
+ public QuickButCruddyTextExtractor(NPOIFSFileSystem poifs) throws IOException {
fs = poifs;
// Find the PowerPoint bit, and get out the bytes
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
/**
* Tests that POIDocument correctly loads and saves the common
// Create a new version
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- POIFSFileSystem inFS = new POIFSFileSystem(bais);
+ OPOIFSFileSystem inFS = new OPOIFSFileSystem(bais);
// Check they're still there
doc.directory = inFS.getRoot();
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
/**
* Tests various bugs have been fixed
*/
public void test54233() throws Exception {
DocumentInputStream dis;
- POIFSFileSystem fs =
- new POIFSFileSystem(_samples.openResourceAsStream("TestNon4ByteBoundary.doc"));
+ NPOIFSFileSystem fs =
+ new NPOIFSFileSystem(_samples.openResourceAsStream("TestNon4ByteBoundary.doc"));
dis = fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME);
SummaryInformation si = (SummaryInformation)PropertySetFactory.create(dis);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
doc.write(baos);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- doc = new HPSFPropertiesOnlyDocument(new POIFSFileSystem(bais));
+ doc = new HPSFPropertiesOnlyDocument(new NPOIFSFileSystem(bais));
// Check properties are still there
assertEquals("Microsoft Word 10.0", si.getApplicationName());
*/
public void test56138() throws Exception {
DocumentInputStream dis;
- POIFSFileSystem fs =
- new POIFSFileSystem(_samples.openResourceAsStream("TestZeroLengthCodePage.mpp"));
+ NPOIFSFileSystem fs =
+ new NPOIFSFileSystem(_samples.openResourceAsStream("TestZeroLengthCodePage.mpp"));
dis = fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME);
SummaryInformation si = (SummaryInformation)PropertySetFactory.create(dis);
package org.apache.poi.hssf;
+import java.io.InputStream;
+
import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
public HSSFWorkbook openSampleWorkbook(String sampleFileName) {
return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
}
+ public InputStream openWorkbookStream(String sampleFileName) {
+ return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
+ }
public HSSFWorkbook writeOutAndReadBack(Workbook original) {
if(!(original instanceof HSSFWorkbook)) {
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
* (is an excel 95 file though)
*/
@Test
- public void bug46904() {
+ public void bug46904() throws Exception {
try {
- openSample("46904.xls");
+ OPOIFSFileSystem fs = new OPOIFSFileSystem(
+ HSSFITestDataProvider.instance.openWorkbookStream("46904.xls"));
+ new HSSFWorkbook(fs.getRoot(), false);
fail();
} catch(OldExcelFormatException e) {
assertTrue(e.getMessage().startsWith(
"The supplied spreadsheet seems to be Excel"
));
}
+ // TODO Fix this to work with NPOIFS as well
+/*
+ try {
+ NPOIFSFileSystem fs = new NPOIFSFileSystem(
+ HSSFITestDataProvider.instance.openWorkbookStream("46904.xls"));
+ new HSSFWorkbook(fs.getRoot(), false);
+ fail();
+ } catch(OldExcelFormatException e) {
+ assertTrue(e.getMessage().startsWith(
+ "The supplied spreadsheet seems to be Excel"
+ ));
+ }
+*/
}
/**