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

Whitespace / indents

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1753620 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2016-07-20 22:39:12 +00:00
parent 3fa0449747
commit b15c2b1c53
2 changed files with 333 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
View File

@ -61,8 +61,6 @@ import org.apache.poi.util.POILogger;
/** /**
* This class contains the main functionality for the Powerpoint file * This class contains the main functionality for the Powerpoint file
* "reader". It is only a very basic class for now * "reader". It is only a very basic class for now
*
* @author Nick Burch
*/ */
public final class HSLFSlideShowImpl extends POIDocument implements Closeable { public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
public static final int UNSET_OFFSET = -1; public static final int UNSET_OFFSET = -1;

671
src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
View File

@ -75,11 +75,8 @@ import org.apache.poi.util.Internal;
* *
* This class acts as the bucket that we throw all of the Word data structures * This class acts as the bucket that we throw all of the Word data structures
* into. * into.
*
* @author Ryan Ackley
*/ */
public final class HWPFDocument extends HWPFDocumentCore public final class HWPFDocument extends HWPFDocumentCore {
{
/*package*/ static final String PROPERTY_PRESERVE_BIN_TABLES = "org.apache.poi.hwpf.preserveBinTables"; /*package*/ static final String PROPERTY_PRESERVE_BIN_TABLES = "org.apache.poi.hwpf.preserveBinTables";
private static final String PROPERTY_PRESERVE_TEXT_TABLE = "org.apache.poi.hwpf.preserveTextTable"; private static final String PROPERTY_PRESERVE_TEXT_TABLE = "org.apache.poi.hwpf.preserveTextTable";
@ -87,168 +84,168 @@ public final class HWPFDocument extends HWPFDocumentCore
private static final String STREAM_TABLE_0 = "0Table"; private static final String STREAM_TABLE_0 = "0Table";
private static final String STREAM_TABLE_1 = "1Table"; private static final String STREAM_TABLE_1 = "1Table";
/** table stream buffer*/ /** table stream buffer*/
protected byte[] _tableStream; protected byte[] _tableStream;
/** data stream buffer*/ /** data stream buffer*/
protected byte[] _dataStream; protected byte[] _dataStream;
/** Document wide Properties*/ /** Document wide Properties*/
protected DocumentProperties _dop; protected DocumentProperties _dop;
/** Contains text of the document wrapped in a obfuscated Word data /** Contains text of the document wrapped in a obfuscated Word data
* structure*/ * structure*/
protected ComplexFileTable _cft; protected ComplexFileTable _cft;
/** Contains text buffer linked directly to single-piece document text piece */ /** Contains text buffer linked directly to single-piece document text piece */
protected StringBuilder _text; protected StringBuilder _text;
/** Holds the save history for this document. */ /** Holds the save history for this document. */
protected SavedByTable _sbt; protected SavedByTable _sbt;
/** Holds the revision mark authors for this document. */ /** Holds the revision mark authors for this document. */
protected RevisionMarkAuthorTable _rmat; protected RevisionMarkAuthorTable _rmat;
/** Holds FSBA (shape) information */ /** Holds FSBA (shape) information */
private FSPATable _fspaHeaders; private FSPATable _fspaHeaders;
/** Holds FSBA (shape) information */ /** Holds FSBA (shape) information */
private FSPATable _fspaMain; private FSPATable _fspaMain;
/** Escher Drawing Group information */ /** Escher Drawing Group information */
protected EscherRecordHolder _escherRecordHolder; protected EscherRecordHolder _escherRecordHolder;
/** Holds pictures table */ /** Holds pictures table */
protected PicturesTable _pictures; protected PicturesTable _pictures;
/** Holds Office Art objects */ /** Holds Office Art objects */
protected OfficeDrawingsImpl _officeDrawingsHeaders; protected OfficeDrawingsImpl _officeDrawingsHeaders;
/** Holds Office Art objects */ /** Holds Office Art objects */
protected OfficeDrawingsImpl _officeDrawingsMain; protected OfficeDrawingsImpl _officeDrawingsMain;
/** Holds the bookmarks tables */ /** Holds the bookmarks tables */
protected BookmarksTables _bookmarksTables; protected BookmarksTables _bookmarksTables;
/** Holds the bookmarks */ /** Holds the bookmarks */
protected Bookmarks _bookmarks; protected Bookmarks _bookmarks;
/** Holds the ending notes tables */ /** Holds the ending notes tables */
protected NotesTables _endnotesTables = new NotesTables( NoteType.ENDNOTE ); protected NotesTables _endnotesTables = new NotesTables( NoteType.ENDNOTE );
/** Holds the footnotes */ /** Holds the footnotes */
protected Notes _endnotes = new NotesImpl( _endnotesTables ); protected Notes _endnotes = new NotesImpl( _endnotesTables );
/** Holds the footnotes tables */ /** Holds the footnotes tables */
protected NotesTables _footnotesTables = new NotesTables( NoteType.FOOTNOTE ); protected NotesTables _footnotesTables = new NotesTables( NoteType.FOOTNOTE );
/** Holds the footnotes */ /** Holds the footnotes */
protected Notes _footnotes = new NotesImpl( _footnotesTables ); protected Notes _footnotes = new NotesImpl( _footnotesTables );
/** Holds the fields PLCFs */ /** Holds the fields PLCFs */
protected FieldsTables _fieldsTables; protected FieldsTables _fieldsTables;
/** Holds the fields */ /** Holds the fields */
protected Fields _fields; protected Fields _fields;
protected HWPFDocument() protected HWPFDocument()
{
super();
this._text = new StringBuilder("\r");
}
/**
* This constructor loads a Word document from an InputStream.
*
* @param istream The InputStream that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in InputStream.
*/
public HWPFDocument(InputStream istream) throws IOException
{
//do Ole stuff
this( verifyAndBuildPOIFS(istream) );
}
/**
* This constructor loads a Word document from a POIFSFileSystem
*
* @param pfilesystem The POIFSFileSystem that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in POIFSFileSystem.
*/
public HWPFDocument(POIFSFileSystem pfilesystem) throws IOException
{
this(pfilesystem.getRoot());
}
/**
* This constructor loads a Word document from a specific point
* in a POIFSFileSystem, probably not the default.
* Used typically to open embeded documents.
*
* @param directory The DirectoryNode that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in POIFSFileSystem.
*/
public HWPFDocument(DirectoryNode directory) throws IOException
{
// Load the main stream and FIB
// Also handles HPSF bits
super(directory);
// Is this document too old for us?
if(_fib.getFibBase().getNFib() < 106) {
throw new OldWordFileFormatException("The document is too old - Word 95 or older. Try HWPFOldDocument instead?");
}
// use the fib to determine the name of the table stream.
String name = STREAM_TABLE_0;
if (_fib.getFibBase().isFWhichTblStm())
{ {
name = STREAM_TABLE_1; super();
this._text = new StringBuilder("\r");
} }
// Grab the table stream. /**
if (!directory.hasEntry(name)) { * This constructor loads a Word document from an InputStream.
throw new IllegalStateException("Table Stream '" + name + "' wasn't found - Either the document is corrupt, or is Word95 (or earlier)"); *
* @param istream The InputStream that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in InputStream.
*/
public HWPFDocument(InputStream istream) throws IOException
{
//do Ole stuff
this( verifyAndBuildPOIFS(istream) );
} }
// read in the table stream. /**
InputStream is = directory.createDocumentInputStream(name); * This constructor loads a Word document from a POIFSFileSystem
_tableStream = IOUtils.toByteArray(is); *
is.close(); * @param pfilesystem The POIFSFileSystem that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in POIFSFileSystem.
*/
public HWPFDocument(POIFSFileSystem pfilesystem) throws IOException
{
this(pfilesystem.getRoot());
}
_fib.fillVariableFields(_mainStream, _tableStream); /**
* This constructor loads a Word document from a specific point
* in a POIFSFileSystem, probably not the default.
* Used typically to open embeded documents.
*
* @param directory The DirectoryNode that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in POIFSFileSystem.
*/
public HWPFDocument(DirectoryNode directory) throws IOException
{
// Load the main stream and FIB
// Also handles HPSF bits
super(directory);
// read in the data stream. // Is this document too old for us?
InputStream dis = null; if(_fib.getFibBase().getNFib() < 106) {
try { throw new OldWordFileFormatException("The document is too old - Word 95 or older. Try HWPFOldDocument instead?");
DocumentEntry dataProps = (DocumentEntry)directory.getEntry(STREAM_DATA);
dis = directory.createDocumentInputStream(STREAM_DATA);
_dataStream = IOUtils.toByteArray(dis, dataProps.getSize());
} catch(IOException e) {
_dataStream = new byte[0];
} finally {
if (dis != null) {
dis.close();
} }
}
// Get the cp of the start of text in the main stream // use the fib to determine the name of the table stream.
// The latest spec doc says this is always zero! String name = STREAM_TABLE_0;
int fcMin = 0; if (_fib.getFibBase().isFWhichTblStm())
//fcMin = _fib.getFcMin() {
name = STREAM_TABLE_1;
}
// Start to load up our standard structures. // Grab the table stream.
_dop = new DocumentProperties(_tableStream, _fib.getFcDop(), _fib.getLcbDop() ); if (!directory.hasEntry(name)) {
_cft = new ComplexFileTable(_mainStream, _tableStream, _fib.getFcClx(), fcMin); throw new IllegalStateException("Table Stream '" + name + "' wasn't found - Either the document is corrupt, or is Word95 (or earlier)");
TextPieceTable _tpt = _cft.getTextPieceTable(); }
// Now load the rest of the properties, which need to be adjusted // read in the table stream.
// for where text really begin InputStream is = directory.createDocumentInputStream(name);
_cbt = new CHPBinTable(_mainStream, _tableStream, _fib.getFcPlcfbteChpx(), _fib.getLcbPlcfbteChpx(), _tpt); _tableStream = IOUtils.toByteArray(is);
_pbt = new PAPBinTable(_mainStream, _tableStream, _dataStream, _fib.getFcPlcfbtePapx(), _fib.getLcbPlcfbtePapx(), _tpt); is.close();
_fib.fillVariableFields(_mainStream, _tableStream);
// read in the data stream.
InputStream dis = null;
try {
DocumentEntry dataProps = (DocumentEntry)directory.getEntry(STREAM_DATA);
dis = directory.createDocumentInputStream(STREAM_DATA);
_dataStream = IOUtils.toByteArray(dis, dataProps.getSize());
} catch(IOException e) {
_dataStream = new byte[0];
} finally {
if (dis != null) {
dis.close();
}
}
// Get the cp of the start of text in the main stream
// The latest spec doc says this is always zero!
int fcMin = 0;
//fcMin = _fib.getFcMin()
// Start to load up our standard structures.
_dop = new DocumentProperties(_tableStream, _fib.getFcDop(), _fib.getLcbDop() );
_cft = new ComplexFileTable(_mainStream, _tableStream, _fib.getFcClx(), fcMin);
TextPieceTable _tpt = _cft.getTextPieceTable();
// Now load the rest of the properties, which need to be adjusted
// for where text really begin
_cbt = new CHPBinTable(_mainStream, _tableStream, _fib.getFcPlcfbteChpx(), _fib.getLcbPlcfbteChpx(), _tpt);
_pbt = new PAPBinTable(_mainStream, _tableStream, _dataStream, _fib.getFcPlcfbtePapx(), _fib.getLcbPlcfbtePapx(), _tpt);
_text = _tpt.getText(); _text = _tpt.getText();
@ -257,18 +254,14 @@ public final class HWPFDocument extends HWPFDocumentCore
* miss from output, and text order may be corrupted * miss from output, and text order may be corrupted
*/ */
boolean preserveBinTables = false; boolean preserveBinTables = false;
try try {
{
preserveBinTables = Boolean.parseBoolean( System preserveBinTables = Boolean.parseBoolean( System
.getProperty( PROPERTY_PRESERVE_BIN_TABLES ) ); .getProperty( PROPERTY_PRESERVE_BIN_TABLES ) );
} } catch ( Exception exc ) {
catch ( Exception exc )
{
// ignore; // ignore;
} }
if ( !preserveBinTables ) if ( !preserveBinTables ) {
{
_cbt.rebuild( _cft ); _cbt.rebuild( _cft );
_pbt.rebuild( _text, _cft ); _pbt.rebuild( _text, _cft );
} }
@ -278,17 +271,13 @@ public final class HWPFDocument extends HWPFDocumentCore
* will lead to unpredictable behavior * will lead to unpredictable behavior
*/ */
boolean preserveTextTable = false; boolean preserveTextTable = false;
try try {
{
preserveTextTable = Boolean.parseBoolean( System preserveTextTable = Boolean.parseBoolean( System
.getProperty( PROPERTY_PRESERVE_TEXT_TABLE ) ); .getProperty( PROPERTY_PRESERVE_TEXT_TABLE ) );
} } catch ( Exception exc ) {
catch ( Exception exc )
{
// ignore; // ignore;
} }
if ( !preserveTextTable ) if ( !preserveTextTable ) {
{
_cft = new ComplexFileTable(); _cft = new ComplexFileTable();
_tpt = _cft.getTextPieceTable(); _tpt = _cft.getTextPieceTable();
final TextPiece textPiece = new SinglentonTextPiece( _text ); final TextPiece textPiece = new SinglentonTextPiece( _text );
@ -303,24 +292,24 @@ public final class HWPFDocument extends HWPFDocumentCore
FSPADocumentPart.HEADER ); FSPADocumentPart.HEADER );
_fspaMain = new FSPATable( _tableStream, _fib, FSPADocumentPart.MAIN ); _fspaMain = new FSPATable( _tableStream, _fib, FSPADocumentPart.MAIN );
if (_fib.getFcDggInfo() != 0) if (_fib.getFcDggInfo() != 0)
{ {
_escherRecordHolder = new EscherRecordHolder(_tableStream, _fib.getFcDggInfo(), _fib.getLcbDggInfo()); _escherRecordHolder = new EscherRecordHolder(_tableStream, _fib.getFcDggInfo(), _fib.getLcbDggInfo());
} else } else
{ {
_escherRecordHolder = new EscherRecordHolder(); _escherRecordHolder = new EscherRecordHolder();
} }
// read in the pictures stream // read in the pictures stream
_pictures = new PicturesTable(this, _dataStream, _mainStream, _fspaMain, _escherRecordHolder); _pictures = new PicturesTable(this, _dataStream, _mainStream, _fspaMain, _escherRecordHolder);
// And escher pictures // And escher pictures
_officeDrawingsHeaders = new OfficeDrawingsImpl( _fspaHeaders, _escherRecordHolder, _mainStream ); _officeDrawingsHeaders = new OfficeDrawingsImpl( _fspaHeaders, _escherRecordHolder, _mainStream );
_officeDrawingsMain = new OfficeDrawingsImpl( _fspaMain , _escherRecordHolder, _mainStream); _officeDrawingsMain = new OfficeDrawingsImpl( _fspaMain , _escherRecordHolder, _mainStream);
_st = new SectionTable(_mainStream, _tableStream, _fib.getFcPlcfsed(), _fib.getLcbPlcfsed(), fcMin, _tpt, _fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN)); _st = new SectionTable(_mainStream, _tableStream, _fib.getFcPlcfsed(), _fib.getLcbPlcfsed(), fcMin, _tpt, _fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN));
_ss = new StyleSheet(_tableStream, _fib.getFcStshf()); _ss = new StyleSheet(_tableStream, _fib.getFcStshf());
_ft = new FontTable(_tableStream, _fib.getFcSttbfffn(), _fib.getLcbSttbfffn()); _ft = new FontTable(_tableStream, _fib.getFcSttbfffn(), _fib.getLcbSttbfffn());
int listOffset = _fib.getFcPlfLst(); int listOffset = _fib.getFcPlfLst();
// int lfoOffset = _fib.getFcPlfLfo(); // int lfoOffset = _fib.getFcPlfLfo();
@ -330,38 +319,38 @@ public final class HWPFDocument extends HWPFDocumentCore
_fib.getLcbPlfLfo() ); _fib.getLcbPlfLfo() );
} }
int sbtOffset = _fib.getFcSttbSavedBy(); int sbtOffset = _fib.getFcSttbSavedBy();
int sbtLength = _fib.getLcbSttbSavedBy(); int sbtLength = _fib.getLcbSttbSavedBy();
if (sbtOffset != 0 && sbtLength != 0) if (sbtOffset != 0 && sbtLength != 0)
{ {
_sbt = new SavedByTable(_tableStream, sbtOffset, sbtLength); _sbt = new SavedByTable(_tableStream, sbtOffset, sbtLength);
}
int rmarkOffset = _fib.getFcSttbfRMark();
int rmarkLength = _fib.getLcbSttbfRMark();
if (rmarkOffset != 0 && rmarkLength != 0)
{
_rmat = new RevisionMarkAuthorTable(_tableStream, rmarkOffset, rmarkLength);
}
_bookmarksTables = new BookmarksTables( _tableStream, _fib );
_bookmarks = new BookmarksImpl( _bookmarksTables );
_endnotesTables = new NotesTables( NoteType.ENDNOTE, _tableStream, _fib );
_endnotes = new NotesImpl( _endnotesTables );
_footnotesTables = new NotesTables( NoteType.FOOTNOTE, _tableStream, _fib );
_footnotes = new NotesImpl( _footnotesTables );
_fieldsTables = new FieldsTables(_tableStream, _fib);
_fields = new FieldsImpl(_fieldsTables);
} }
int rmarkOffset = _fib.getFcSttbfRMark(); @Internal
int rmarkLength = _fib.getLcbSttbfRMark(); public TextPieceTable getTextTable()
if (rmarkOffset != 0 && rmarkLength != 0)
{ {
_rmat = new RevisionMarkAuthorTable(_tableStream, rmarkOffset, rmarkLength); return _cft.getTextPieceTable();
} }
_bookmarksTables = new BookmarksTables( _tableStream, _fib );
_bookmarks = new BookmarksImpl( _bookmarksTables );
_endnotesTables = new NotesTables( NoteType.ENDNOTE, _tableStream, _fib );
_endnotes = new NotesImpl( _endnotesTables );
_footnotesTables = new NotesTables( NoteType.FOOTNOTE, _tableStream, _fib );
_footnotes = new NotesImpl( _footnotesTables );
_fieldsTables = new FieldsTables(_tableStream, _fib);
_fields = new FieldsImpl(_fieldsTables);
}
@Internal
public TextPieceTable getTextTable()
{
return _cft.getTextPieceTable();
}
@Internal @Internal
@Override @Override
public StringBuilder getText() public StringBuilder getText()
@ -369,14 +358,14 @@ public final class HWPFDocument extends HWPFDocumentCore
return _text; return _text;
} }
public DocumentProperties getDocProperties() public DocumentProperties getDocProperties()
{ {
return _dop; return _dop;
} }
public Range getOverallRange() { public Range getOverallRange() {
return new Range(0, _text.length(), this); return new Range(0, _text.length(), this);
} }
/** /**
* Returns the range which covers the whole of the document, but excludes * Returns the range which covers the whole of the document, but excludes
@ -591,52 +580,52 @@ public final class HWPFDocument extends HWPFDocumentCore
throw new IllegalStateException("Coming soon!"); throw new IllegalStateException("Coming soon!");
} }
/** /**
* Writes out the word file that is represented by an instance of this class. * Writes out the word file that is represented by an instance of this class.
* *
* If {@code stream} is a {@link java.io.FileOutputStream} on a networked drive * If {@code stream} is a {@link java.io.FileOutputStream} on a networked drive
* or has a high cost/latency associated with each written byte, * or has a high cost/latency associated with each written byte,
* consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream} * consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream}
* to improve write performance. * to improve write performance.
* *
* @param out The OutputStream to write to. * @param out The OutputStream to write to.
* @throws IOException If there is an unexpected IOException from the passed * @throws IOException If there is an unexpected IOException from the passed
* in OutputStream. * in OutputStream.
*/ */
public void write(OutputStream out) public void write(OutputStream out)
throws IOException throws IOException
{ {
// initialize our streams for writing. // initialize our streams for writing.
HWPFFileSystem docSys = new HWPFFileSystem(); HWPFFileSystem docSys = new HWPFFileSystem();
HWPFOutputStream wordDocumentStream = docSys.getStream(STREAM_WORD_DOCUMENT); HWPFOutputStream wordDocumentStream = docSys.getStream(STREAM_WORD_DOCUMENT);
HWPFOutputStream tableStream = docSys.getStream(STREAM_TABLE_1); HWPFOutputStream tableStream = docSys.getStream(STREAM_TABLE_1);
//HWPFOutputStream dataStream = docSys.getStream("Data"); //HWPFOutputStream dataStream = docSys.getStream("Data");
int tableOffset = 0; int tableOffset = 0;
// FileInformationBlock fib = (FileInformationBlock)_fib.clone(); // FileInformationBlock fib = (FileInformationBlock)_fib.clone();
// clear the offsets and sizes in our FileInformationBlock. // clear the offsets and sizes in our FileInformationBlock.
_fib.clearOffsetsSizes(); _fib.clearOffsetsSizes();
// determine the FileInformationBLock size // determine the FileInformationBLock size
int fibSize = _fib.getSize(); int fibSize = _fib.getSize();
fibSize += POIFSConstants.SMALLER_BIG_BLOCK_SIZE - fibSize += POIFSConstants.SMALLER_BIG_BLOCK_SIZE -
(fibSize % POIFSConstants.SMALLER_BIG_BLOCK_SIZE); (fibSize % POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
// preserve space for the FileInformationBlock because we will be writing // preserve space for the FileInformationBlock because we will be writing
// it after we write everything else. // it after we write everything else.
byte[] placeHolder = new byte[fibSize]; byte[] placeHolder = new byte[fibSize];
wordDocumentStream.write(placeHolder); wordDocumentStream.write(placeHolder);
int mainOffset = wordDocumentStream.getOffset(); int mainOffset = wordDocumentStream.getOffset();
// write out the StyleSheet. // write out the StyleSheet.
_fib.setFcStshf(tableOffset); _fib.setFcStshf(tableOffset);
_ss.writeTo(tableStream); _ss.writeTo(tableStream);
_fib.setLcbStshf(tableStream.getOffset() - tableOffset); _fib.setLcbStshf(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
// get fcMin and fcMac because we will be writing the actual text with the // get fcMin and fcMac because we will be writing the actual text with the
// complex table. // complex table.
int fcMin = mainOffset; int fcMin = mainOffset;
/* /*
* clx (encoding of the sprm lists for a complex file and piece table * clx (encoding of the sprm lists for a complex file and piece table
@ -647,12 +636,12 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 23 of 210 * Specification; Page 23 of 210
*/ */
// write out the Complex table, includes text. // write out the Complex table, includes text.
_fib.setFcClx(tableOffset); _fib.setFcClx(tableOffset);
_cft.writeTo(wordDocumentStream, tableStream); _cft.writeTo(wordDocumentStream, tableStream);
_fib.setLcbClx(tableStream.getOffset() - tableOffset); _fib.setLcbClx(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
int fcMac = wordDocumentStream.getOffset(); int fcMac = wordDocumentStream.getOffset();
/* /*
* dop (document properties record) Written immediately after the end of * dop (document properties record) Written immediately after the end of
@ -663,11 +652,11 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 23 of 210 * Specification; Page 23 of 210
*/ */
// write out the DocumentProperties. // write out the DocumentProperties.
_fib.setFcDop(tableOffset); _fib.setFcDop(tableOffset);
_dop.writeTo(tableStream); _dop.writeTo(tableStream);
_fib.setLcbDop(tableStream.getOffset() - tableOffset); _fib.setLcbDop(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
/* /*
* plcfBkmkf (table recording beginning CPs of bookmarks) Written * plcfBkmkf (table recording beginning CPs of bookmarks) Written
@ -703,11 +692,11 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 24 of 210 * Specification; Page 24 of 210
*/ */
// write out the CHPBinTable. // write out the CHPBinTable.
_fib.setFcPlcfbteChpx(tableOffset); _fib.setFcPlcfbteChpx(tableOffset);
_cbt.writeTo(wordDocumentStream, tableStream, fcMin, _cft.getTextPieceTable()); _cbt.writeTo(wordDocumentStream, tableStream, fcMin, _cft.getTextPieceTable());
_fib.setLcbPlcfbteChpx(tableStream.getOffset() - tableOffset); _fib.setLcbPlcfbteChpx(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
/* /*
* plcfbtePapx (bin table for PAP FKPs) Written immediately after the * plcfbtePapx (bin table for PAP FKPs) Written immediately after the
@ -717,11 +706,11 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 24 of 210 * Specification; Page 24 of 210
*/ */
// write out the PAPBinTable. // write out the PAPBinTable.
_fib.setFcPlcfbtePapx(tableOffset); _fib.setFcPlcfbtePapx(tableOffset);
_pbt.writeTo(wordDocumentStream, tableStream, _cft.getTextPieceTable()); _pbt.writeTo(wordDocumentStream, tableStream, _cft.getTextPieceTable());
_fib.setLcbPlcfbtePapx(tableStream.getOffset() - tableOffset); _fib.setLcbPlcfbtePapx(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
/* /*
* plcfendRef (endnote reference position table) Written immediately * plcfendRef (endnote reference position table) Written immediately
@ -737,20 +726,20 @@ public final class HWPFDocument extends HWPFDocumentCore
_endnotesTables.writeTxt( _fib, tableStream ); _endnotesTables.writeTxt( _fib, tableStream );
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
/* /*
* plcffld*** (table of field positions and statuses for annotation * plcffld*** (table of field positions and statuses for annotation
* subdocument) Written immediately after the previously recorded table, * subdocument) Written immediately after the previously recorded table,
* if the ******* subdocument contains fields. * if the ******* subdocument contains fields.
* *
* Microsoft Office Word 97-2007 Binary File Format (.doc) * Microsoft Office Word 97-2007 Binary File Format (.doc)
* Specification; Page 24 of 210 * Specification; Page 24 of 210
*/ */
if ( _fieldsTables != null ) if ( _fieldsTables != null )
{ {
_fieldsTables.write( _fib, tableStream ); _fieldsTables.write( _fib, tableStream );
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
} }
/* /*
* plcffndRef (footnote reference position table) Written immediately * plcffndRef (footnote reference position table) Written immediately
@ -774,11 +763,11 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 25 of 210 * Specification; Page 25 of 210
*/ */
// write out the SectionTable. // write out the SectionTable.
_fib.setFcPlcfsed(tableOffset); _fib.setFcPlcfsed(tableOffset);
_st.writeTo(wordDocumentStream, tableStream); _st.writeTo(wordDocumentStream, tableStream);
_fib.setLcbPlcfsed(tableStream.getOffset() - tableOffset); _fib.setLcbPlcfsed(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
// write out the list tables // write out the list tables
if ( _lt != null ) if ( _lt != null )
@ -834,72 +823,72 @@ public final class HWPFDocument extends HWPFDocumentCore
* Specification; Page 27 of 210 * Specification; Page 27 of 210
*/ */
// write out the saved-by table. // write out the saved-by table.
if (_sbt != null) if (_sbt != null)
{ {
_fib.setFcSttbSavedBy(tableOffset); _fib.setFcSttbSavedBy(tableOffset);
_sbt.writeTo(tableStream); _sbt.writeTo(tableStream);
_fib.setLcbSttbSavedBy(tableStream.getOffset() - tableOffset); _fib.setLcbSttbSavedBy(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
} }
// write out the revision mark authors table. // write out the revision mark authors table.
if (_rmat != null) if (_rmat != null)
{ {
_fib.setFcSttbfRMark(tableOffset); _fib.setFcSttbfRMark(tableOffset);
_rmat.writeTo(tableStream); _rmat.writeTo(tableStream);
_fib.setLcbSttbfRMark(tableStream.getOffset() - tableOffset); _fib.setLcbSttbfRMark(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
} }
// write out the FontTable. // write out the FontTable.
_fib.setFcSttbfffn(tableOffset); _fib.setFcSttbfffn(tableOffset);
_ft.writeTo(tableStream); _ft.writeTo(tableStream);
_fib.setLcbSttbfffn(tableStream.getOffset() - tableOffset); _fib.setLcbSttbfffn(tableStream.getOffset() - tableOffset);
tableOffset = tableStream.getOffset(); tableOffset = tableStream.getOffset();
// set some variables in the FileInformationBlock. // set some variables in the FileInformationBlock.
_fib.getFibBase().setFcMin(fcMin); _fib.getFibBase().setFcMin(fcMin);
_fib.getFibBase().setFcMac(fcMac); _fib.getFibBase().setFcMac(fcMac);
_fib.setCbMac(wordDocumentStream.getOffset()); _fib.setCbMac(wordDocumentStream.getOffset());
// make sure that the table, doc and data streams use big blocks. // make sure that the table, doc and data streams use big blocks.
byte[] mainBuf = wordDocumentStream.toByteArray(); byte[] mainBuf = wordDocumentStream.toByteArray();
if (mainBuf.length < 4096) if (mainBuf.length < 4096)
{ {
byte[] tempBuf = new byte[4096]; byte[] tempBuf = new byte[4096];
System.arraycopy(mainBuf, 0, tempBuf, 0, mainBuf.length); System.arraycopy(mainBuf, 0, tempBuf, 0, mainBuf.length);
mainBuf = tempBuf; mainBuf = tempBuf;
} }
// Table1 stream will be used // Table1 stream will be used
_fib.getFibBase().setFWhichTblStm( true ); _fib.getFibBase().setFWhichTblStm( true );
// write out the FileInformationBlock. // write out the FileInformationBlock.
//_fib.serialize(mainBuf, 0); //_fib.serialize(mainBuf, 0);
_fib.writeTo(mainBuf, tableStream); _fib.writeTo(mainBuf, tableStream);
byte[] tableBuf = tableStream.toByteArray(); byte[] tableBuf = tableStream.toByteArray();
if (tableBuf.length < 4096) if (tableBuf.length < 4096)
{ {
byte[] tempBuf = new byte[4096]; byte[] tempBuf = new byte[4096];
System.arraycopy(tableBuf, 0, tempBuf, 0, tableBuf.length); System.arraycopy(tableBuf, 0, tempBuf, 0, tableBuf.length);
tableBuf = tempBuf; tableBuf = tempBuf;
} }
byte[] dataBuf = _dataStream; byte[] dataBuf = _dataStream;
if (dataBuf == null) if (dataBuf == null)
{ {
dataBuf = new byte[4096]; dataBuf = new byte[4096];
} }
if (dataBuf.length < 4096) if (dataBuf.length < 4096)
{ {
byte[] tempBuf = new byte[4096]; byte[] tempBuf = new byte[4096];
System.arraycopy(dataBuf, 0, tempBuf, 0, dataBuf.length); System.arraycopy(dataBuf, 0, tempBuf, 0, dataBuf.length);
dataBuf = tempBuf; dataBuf = tempBuf;
} }
// create new document preserving order of entries // create new document preserving order of entries
NPOIFSFileSystem pfs = new NPOIFSFileSystem(); NPOIFSFileSystem pfs = new NPOIFSFileSystem();
@ -990,16 +979,16 @@ public final class HWPFDocument extends HWPFDocumentCore
this._dataStream = dataBuf; this._dataStream = dataBuf;
} }
@Internal @Internal
public byte[] getDataStream() public byte[] getDataStream()
{ {
return _dataStream; return _dataStream;
} }
@Internal @Internal
public byte[] getTableStream() public byte[] getTableStream()
{ {
return _tableStream; return _tableStream;
} }
public int registerList( HWPFList list ) public int registerList( HWPFList list )
{ {