From 3cbc750868e46e07ef27d1088a47e57cab62d6cf Mon Sep 17 00:00:00 2001
From: Nick Burch
Date: Wed, 20 Aug 2008 13:47:57 +0000
Subject: [PATCH] Merged revisions
638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676309,676311-676456,676458-676994,676996-677027,677030-677040,677042-677056,677058-677375,677377-677968,677970-677971,677973,677975-677994,677996-678286,678288-678538,678540-680393,680395-680469,680471-680529,680531-680852,680854-681529,681531-681571,681573-682224,682226,682228,682231-682281,682283-682335,682337-682507,682509,682512-682517,682519-682532,682534-682619,682622-682777,682779-682998,683000-683019,683021-683022,683024-683080,683082-683092,683094-683095,683097-683127,683129-683131,683133-683166,683168-683698,683700-683705,683707-683757,683759-683787,683789-683870,683872-683879,683881-683900,683902-684066,684068-684074,684076-684222,684224-684254,684257-684281,684283-684286,684288-684292,684294-684298,684300-684301,684303-684308,684310-684317,684320,684323-684335,684337-684348,684350-684354,684356-684361,684363-684369,684371-684453,684455-684883,684885-684937,684940-684958,684960-684970,684972-684985,684987-685053,685055-685063,685065-685259,685261-685262,685264-685266,685268-685282,685285-686035,686037-686045,686047-686052,686054-687331
via svnmerge from https://svn.apache.org/repos/asf/poi/trunk
........
r686207 | nick | 2008-08-15 13:43:02 +0100 (Fri, 15 Aug 2008) | 1 line
Add sample publisher files from bug #45602 to svn
........
r686216 | nick | 2008-08-15 15:05:30 +0100 (Fri, 15 Aug 2008) | 1 line
Add a few more source package excludes
........
r686278 | nick | 2008-08-15 17:57:30 +0100 (Fri, 15 Aug 2008) | 1 line
More sample hpbf docs, with a description
........
r686290 | nick | 2008-08-15 18:42:25 +0100 (Fri, 15 Aug 2008) | 1 line
Start on a HPBF dumper
........
r686621 | nick | 2008-08-17 17:36:40 +0100 (Sun, 17 Aug 2008) | 1 line
Few little tweaks to dev helpers
........
r686624 | nick | 2008-08-17 18:39:10 +0100 (Sun, 17 Aug 2008) | 1 line
More work understanding hpbf
........
r686625 | nick | 2008-08-17 19:02:31 +0100 (Sun, 17 Aug 2008) | 1 line
More work understanding hpbf
........
r686628 | nick | 2008-08-17 19:21:34 +0100 (Sun, 17 Aug 2008) | 1 line
More work understanding hpbf
........
r686640 | nick | 2008-08-17 21:15:51 +0100 (Sun, 17 Aug 2008) | 1 line
Further HPBF documentation, and some more sample files used
........
r686844 | yegor | 2008-08-18 19:33:58 +0100 (Mon, 18 Aug 2008) | 1 line
fixed bug #45645: Fix for HSSFSheet.autoSizeColumn() for widths exceeding Short.MAX_VALUE
........
r686977 | josh | 2008-08-19 08:44:57 +0100 (Tue, 19 Aug 2008) | 1 line
Fix for bug 45640 - avoid creating multiple GUTS records
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@687333 13f79535-47bb-0310-9956-ffa450edef68
---
build.xml | 9 +
src/documentation/content/xdocs/book.xml | 1 +
src/documentation/content/xdocs/changes.xml | 1 +
.../content/xdocs/hpbf/file-format.xml | 170 +++++++++
.../content/xdocs/hpbf/index.xml | 53 +++
src/documentation/content/xdocs/index.xml | 28 +-
src/documentation/content/xdocs/status.xml | 1 +
src/java/org/apache/poi/hssf/model/Sheet.java | 57 +--
.../apache/poi/hssf/usermodel/HSSFSheet.java | 3 +-
.../org/apache/poi/poifs/dev/POIFSLister.java | 33 +-
.../org/apache/poi/hpbf/dev/HPBFDumper.java | 353 ++++++++++++++++++
.../org/apache/poi/hpbf/data/Sample.pub | Bin 0 -> 72192 bytes
.../org/apache/poi/hpbf/data/Sample.txt | 29 ++
.../org/apache/poi/hpbf/data/Sample2.pub | Bin 0 -> 72704 bytes
.../org/apache/poi/hpbf/data/Sample2.txt | 34 ++
.../org/apache/poi/hpbf/data/Sample2000.pub | Bin 0 -> 61440 bytes
.../org/apache/poi/hpbf/data/Sample3.pub | Bin 0 -> 72192 bytes
.../org/apache/poi/hpbf/data/Sample3.txt | 29 ++
.../org/apache/poi/hpbf/data/Sample4.pub | Bin 0 -> 72192 bytes
.../org/apache/poi/hpbf/data/Sample4.txt | 29 ++
.../org/apache/poi/hpbf/data/Sample98.pub | Bin 0 -> 61440 bytes
.../apache/poi/hpbf/data/SampleBrochure.pub | Bin 0 -> 161792 bytes
.../apache/poi/hpbf/data/SampleNewsletter.pub | Bin 0 -> 291840 bytes
.../org/apache/poi/hssf/model/TestSheet.java | 31 +-
24 files changed, 801 insertions(+), 60 deletions(-)
create mode 100644 src/documentation/content/xdocs/hpbf/file-format.xml
create mode 100755 src/documentation/content/xdocs/hpbf/index.xml
create mode 100644 src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.txt
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.txt
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2000.pub
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.txt
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.txt
create mode 100755 src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample98.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleBrochure.pub
create mode 100644 src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleNewsletter.pub
diff --git a/build.xml b/build.xml
index cbbfde883..3eed344cb 100644
--- a/build.xml
+++ b/build.xml
@@ -649,6 +649,7 @@ under the License.
+
@@ -707,6 +708,7 @@ under the License.
+
@@ -742,6 +744,7 @@ under the License.
+
@@ -1284,10 +1287,13 @@ FORREST_HOME environment variable!
+
+
+
@@ -1313,10 +1319,13 @@ FORREST_HOME environment variable!
+
+
+
diff --git a/src/documentation/content/xdocs/book.xml b/src/documentation/content/xdocs/book.xml
index a55b67bad..d9bc0e91d 100644
--- a/src/documentation/content/xdocs/book.xml
+++ b/src/documentation/content/xdocs/book.xml
@@ -41,6 +41,7 @@
+
diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 269a13fd4..62fee5b1c 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -64,6 +64,7 @@
Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx
+ 45645 - Fix for HSSFSheet.autoSizeColumn() for widths exceeding Short.MAX_VALUE45623 - Support for additional HSSF header and footer fields, including bold and full file path45623 - Support stripping HSSF header and footer fields (eg page number) out of header and footer text if required45622 - Support stripping HWPF fields (eg macros) out of text, via Range.stripFields(text)
diff --git a/src/documentation/content/xdocs/hpbf/file-format.xml b/src/documentation/content/xdocs/hpbf/file-format.xml
new file mode 100644
index 000000000..97d5a33d7
--- /dev/null
+++ b/src/documentation/content/xdocs/hpbf/file-format.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+ POI-HPBF - A Guide to the Publisher File Format
+ Overview
+
+
+
+
+
+
+ Document Streams
+
+ The file is made up of a number of POIFS streams. A typical
+ file will be made up as follows:
+
+
+
+ Changing Text
+
If you make a change to the text of a file, but not change
+ how much text there is, then the CONTENTS stream
+ will undergo a small change, and the Contents stream
+ will undergo a large change.
+
If you make a change to the text of a file, and change the
+ amount of text there is, then both the Contents and
+ the CONTENTS streams change.
+
+ Changing Shapes
+
If you alter the size of a textbox, but make no text changes,
+ then both Contents and CONTENTS streams
+ change. There are no changes to the Escher streams.
+
If you set the background colour of a textbox, but make
+ no changes to the text, (to finish off)
+
+ Structure of CONTENTS
+
First we have "CHNKINK ", followed by 24 bytes.
+
Next we have 20 sequences of 24 bytes each. If the first two bytes
+ at 0x1800, then that sequence entry exists, but if it's 0x0000 then
+ the entry doesn't exist. If it does exist, we then have 4 bytes of
+ upper case ASCII text, followed by three little endian shorts.
+ The first of these seems to be the count of that type, the second is
+ usually 1, the third is usually zero. The we have another 4 bytes of
+ upper case ASCII text, normally but not always the same as the first
+ text. Finally, we have an unsigned little endian 32 bit offset to
+ the start of the data for this, then an unsigned little endian
+ 32 bit offset of the length of this section.
+
Normally, the first sequence entry is for TEXT, and the text data
+ will start at 0x200. After that is normally two or three STSH entries
+ (so the first short has values 0, then 1, then 2). After that it
+ seems to vary.
+
At 0x200 we have the text, stored as little endian 16 bit unicode.
+
After the text comes all sorts of other stuff, presumably as
+ described by the sequences.
+
For a contents stream of length 7168 / 0x1c00 bytes, the start
+ looks something like:
+
+
+
+
diff --git a/src/documentation/content/xdocs/hpbf/index.xml b/src/documentation/content/xdocs/hpbf/index.xml
new file mode 100755
index 000000000..c74dc2362
--- /dev/null
+++ b/src/documentation/content/xdocs/hpbf/index.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ POI-HPBF - Java API To Access Microsoft Publisher Format Files
+ Overview
+
+
+
+
+
+
+
+ Overview
+
+
HPBF is the POI Project's pure Java implementation of the Visio file format.
+
Currently, HPBF is in the experimental stage, while we try
+ to figure out the file format. Our initial aim is to provide
+ a text extractor for the format, with low level code following
+ after that if demand and developer interest warrant it.
+
At this time, there is no usermodel api or similar.
+
Our current understanding of the file format is documented
+ here.
+
+ This code currently lives the
+ scratchpad area
+ of the POI SVN repository.
+ Ensure that you have the scratchpad jar or the scratchpad
+ build area in your
+ classpath before experimenting with this code.
+
+
+
+
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index d112140c7..f8336be0b 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -141,6 +141,16 @@
href="./slideshow/index.html">the HSLF project page for more
information.
+ HPSF for Document Properties
+
HPSF is our port of the OLE 2 property set format to pure
+ Java. Property sets are mostly use to store a document's properties
+ (title, author, date of last modification etc.), but they can be used
+ for application-specific purposes as well.
+
+
HPSF supports both reading and writing of properties.
+
Please see the HPSF project
+ page for more information.
+ HDGF for Visio Documents
HDGF is our port of the Microsoft Viso 97(-2003) file format to pure
Java. It currently only supports reading at a very low level, and
@@ -148,19 +158,13 @@
href="./hdgf/index.html">the HDGF project page for more
information.
- HPSF for Document Properties
-
HPSF is our port of the OLE 2 property set format to pure
- Java. Property sets are mostly use to store a document's properties
- (title, author, date of last modification etc.), but they can be used
- for application-specific purposes as well.
-
-
HPSF supports reading and writing of properties. However, you will
- need to be using version 3.0 of POI to utilise the write support.
-
-
Please see the HPSF project
- page for more information.
+ HPBF for Publisher Documents
+
HPBF is our port of the Microsoft Publisher 98(-2007) file format to pure
+ Java. At the moment, we are still figuring out the file format, but we hope
+ to have simple text extraction shortly. Please see the HPBF project page for more
+ information.
-
Contributing
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index b59455ebf..96272b165 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -61,6 +61,7 @@
Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx
+ 45645 - Fix for HSSFSheet.autoSizeColumn() for widths exceeding Short.MAX_VALUE45623 - Support for additional HSSF header and footer fields, including bold and full file path45623 - Support stripping HSSF header and footer fields (eg page number) out of header and footer text if required45622 - Support stripping HWPF fields (eg macros) out of text, via Range.stripFields(text)
diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 710d57118..336b1dbd4 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -106,7 +106,7 @@ public final class Sheet implements Model {
protected ArrayList records = null;
int preoffset = 0; // offset of the sheet in a new file
- protected int dimsloc = -1; // TODO - is it legal for dims record to be missing?
+ protected int dimsloc = -1; // TODO - remove dimsloc
protected PrintGridlinesRecord printGridlines = null;
protected GridsetRecord gridset = null;
private GutsRecord _gutsRecord;
@@ -125,7 +125,8 @@ public final class Sheet implements Model {
private MergedCellsTable _mergedCellsTable;
/** always present in this POI object, not always written to Excel file */
/*package*/ColumnInfoRecordsAggregate _columnInfos;
- protected DimensionsRecord dims;
+ /** the DimensionsRecord is always present */
+ private DimensionsRecord _dimensions;
protected RowRecordsAggregate _rowsAggregate = null;
private DataValidityTable _dataValidityTable= null;
private ConditionalFormattingTable condFormatting;
@@ -287,7 +288,7 @@ public final class Sheet implements Model {
records.add(retval._columnInfos);
}
- retval.dims = ( DimensionsRecord ) rec;
+ retval._dimensions = ( DimensionsRecord ) rec;
retval.dimsloc = records.size();
}
else if (rec.getSid() == DefaultColWidthRecord.sid)
@@ -333,7 +334,7 @@ public final class Sheet implements Model {
records.add(rec);
}
- if (retval.dimsloc < 0) {
+ if (retval._dimensions == null) {
throw new RuntimeException("DimensionsRecord was not found");
}
retval.records = records;
@@ -404,6 +405,8 @@ public final class Sheet implements Model {
public static Sheet createSheet()
{
+ // TODO - convert this method to a constructor
+
if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Sheet createsheet from scratch called");
Sheet retval = new Sheet();
@@ -423,7 +426,8 @@ public final class Sheet implements Model {
records.add( retval.printGridlines );
retval.gridset = createGridset();
records.add( retval.gridset );
- records.add( retval.createGuts() );
+ retval._gutsRecord = createGuts();
+ records.add( retval._gutsRecord );
retval.defaultrowheight = createDefaultRowHeight();
records.add( retval.defaultrowheight );
records.add( retval.createWSBool() );
@@ -440,8 +444,8 @@ public final class Sheet implements Model {
ColumnInfoRecordsAggregate columns = new ColumnInfoRecordsAggregate();
records.add( columns );
retval._columnInfos = columns;
- retval.dims = createDimensions();
- records.add(retval.dims);
+ retval._dimensions = createDimensions();
+ records.add(retval._dimensions);
retval.dimsloc = records.size()-1;
records.add(retval.windowTwo = retval.createWindowTwo());
retval.selection = createSelection();
@@ -460,7 +464,7 @@ public final class Sheet implements Model {
if (_rowsAggregate == null)
{
_rowsAggregate = new RowRecordsAggregate();
- records.add(getDimsLoc() + 1, _rowsAggregate);
+ records.add(dimsloc + 1, _rowsAggregate);
}
}
private MergedCellsTable getMergedRecords() {
@@ -556,10 +560,10 @@ public final class Sheet implements Model {
.append(lastrow).append("lastcol").append(lastcol)
.toString());
}
- dims.setFirstCol(firstcol);
- dims.setFirstRow(firstrow);
- dims.setLastCol(lastcol);
- dims.setLastRow(lastrow);
+ _dimensions.setFirstCol(firstcol);
+ _dimensions.setFirstRow(firstrow);
+ _dimensions.setLastCol(lastcol);
+ _dimensions.setLastRow(lastrow);
if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Sheet.setDimensions exiting");
}
@@ -696,7 +700,7 @@ public final class Sheet implements Model {
if(log.check(POILogger.DEBUG)) {
log.log(POILogger.DEBUG, "add value record row" + row);
}
- DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
+ DimensionsRecord d = _dimensions;
if (col.getColumn() > d.getLastCol())
{
@@ -720,8 +724,8 @@ public final class Sheet implements Model {
*/
public void removeValueRecord(int row, CellValueRecordInterface col) {
- log.logFormatted(POILogger.DEBUG, "remove value record row,dimsloc %,%",
- new int[]{row, dimsloc} );
+ log.logFormatted(POILogger.DEBUG, "remove value record row %",
+ new int[]{row } );
_rowsAggregate.removeCell(col);
}
@@ -766,7 +770,7 @@ public final class Sheet implements Model {
checkRows();
if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "addRow ");
- DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
+ DimensionsRecord d = _dimensions;
if (row.getRowNumber() >= d.getLastRow())
{
@@ -1330,27 +1334,6 @@ public final class Sheet implements Model {
}
}
- /**
- * get the location of the DimensionsRecord (which is the last record before the value section)
- * @return location in the array of records of the DimensionsRecord
- */
-
- public int getDimsLoc()
- {
- if (log.check( POILogger.DEBUG ))
- log.log(POILogger.DEBUG, "getDimsLoc dimsloc= " + dimsloc);
- return dimsloc;
- }
-
- /**
- * in the event the record is a dimensions record, resets both the loc index and dimsloc index
- */
- public void checkDimsLoc(Record rec, int recloc) {
- if (rec.getSid() == DimensionsRecord.sid) {
- dimsloc = recloc;
- }
- }
-
/**
* @return the serialized size of this sheet
*/
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index e61d7a1cc..3e51fe831 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -1806,10 +1806,11 @@ public class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet
}
if (width != -1) {
+ width *= 256;
if (width > Short.MAX_VALUE) { //width can be bigger that Short.MAX_VALUE!
width = Short.MAX_VALUE;
}
- sheet.setColumnWidth(column, (short) (width * 256));
+ sheet.setColumnWidth(column, (short) (width));
}
}
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/src/java/org/apache/poi/poifs/dev/POIFSLister.java
index c9fa349d6..cdd9902c4 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSLister.java
+++ b/src/java/org/apache/poi/poifs/dev/POIFSLister.java
@@ -45,37 +45,54 @@ public class POIFSLister {
System.exit(1);
}
- for (int j = 0; j < args.length; j++)
- {
- viewFile(args[ j ]);
+ boolean withSizes = false;
+ for (int j = 0; j < args.length; j++) {
+ if(args[j].equalsIgnoreCase("-size") ||
+ args[j].equalsIgnoreCase("-sizes")) {
+ withSizes = true;
+ } else {
+ viewFile(args[j], withSizes);
+ }
}
}
- public static void viewFile(final String filename) throws IOException
+ public static void viewFile(final String filename, boolean withSizes) throws IOException
{
POIFSFileSystem fs = new POIFSFileSystem(
new FileInputStream(filename)
);
- displayDirectory(fs.getRoot(), "");
+ displayDirectory(fs.getRoot(), "", withSizes);
}
- public static void displayDirectory(DirectoryNode dir, String indent) {
+ public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) {
System.out.println(indent + dir.getName() + " -");
String newIndent = indent + " ";
+ boolean hadChildren = false;
for(Iterator it = dir.getEntries(); it.hasNext(); ) {
+ hadChildren = true;
Object entry = it.next();
if(entry instanceof DirectoryNode) {
- displayDirectory((DirectoryNode)entry, newIndent);
+ displayDirectory((DirectoryNode)entry, newIndent, withSizes);
} else {
DocumentNode doc = (DocumentNode)entry;
String name = doc.getName();
+ String size = "";
if(name.charAt(0) < 10) {
String altname = "(0x0" + (int)name.charAt(0) + ")" + name.substring(1);
name = name.substring(1) + " <" + altname + ">";
}
- System.out.println(newIndent + name);
+ if(withSizes) {
+ size = " [" +
+ doc.getSize() + " / 0x" +
+ Integer.toHexString(doc.getSize()) +
+ "]";
+ }
+ System.out.println(newIndent + name + size);
}
}
+ if(!hadChildren) {
+ System.out.println(newIndent + "(no children)");
+ }
}
}
\ No newline at end of file
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java b/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
new file mode 100644
index 000000000..6c52bbb04
--- /dev/null
+++ b/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
@@ -0,0 +1,353 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+package org.apache.poi.hpbf.dev;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.poi.ddf.DefaultEscherRecordFactory;
+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.util.LittleEndian;
+import org.apache.poi.util.StringUtil;
+
+/**
+ * For dumping out the contents of HPBF (Publisher)
+ * files, while we try to figure out how they're
+ * constructed.
+ */
+public class HPBFDumper {
+ private POIFSFileSystem fs;
+ public HPBFDumper(POIFSFileSystem fs) {
+ this.fs = fs;
+ }
+ public HPBFDumper(InputStream inp) throws IOException {
+ this(new POIFSFileSystem(inp));
+ }
+
+ private static byte[] getData(DirectoryNode dir, String name) throws IOException {
+ DocumentEntry docProps =
+ (DocumentEntry)dir.getEntry(name);
+
+ // Grab the document stream
+ byte[] d = new byte[docProps.getSize()];
+ dir.createDocumentInputStream(name).read(d);
+
+ // All done
+ return d;
+ }
+
+ /**
+ * Dumps out the given number of bytes as hex,
+ * two chars
+ */
+ private String dumpBytes(byte[] data, int offset, int len) {
+ StringBuffer ret = new StringBuffer();
+ for(int i=0; i");
+ System.exit(1);
+ }
+ HPBFDumper dump = new HPBFDumper(
+ new FileInputStream(args[0])
+ );
+
+ System.out.println("Dumping " + args[0]);
+ dump.dumpContents();
+ dump.dumpEnvelope();
+ dump.dumpEscher();
+ dump.dump001CompObj(dump.fs.getRoot());
+ dump.dumpQuill();
+
+ // Still to go:
+ // (0x03)Internal
+ // Objects
+ }
+
+ /**
+ * Dump out the escher parts of the file.
+ * Escher -> EscherStm and EscherDelayStm
+ */
+ public void dumpEscher() throws IOException {
+ DirectoryNode escherDir = (DirectoryNode)
+ fs.getRoot().getEntry("Escher");
+
+ dumpEscherStm(escherDir);
+ dumpEscherDelayStm(escherDir);
+ }
+ private void dumpEscherStream(byte[] data) {
+ DefaultEscherRecordFactory erf =
+ new DefaultEscherRecordFactory();
+
+ // Dump
+ int left = data.length;
+ while(left > 0) {
+ EscherRecord er = erf.createRecord(data, 0);
+ er.fillFields(data, 0, erf);
+ left -= er.getRecordSize();
+
+ System.out.println(er.toString());
+ }
+ }
+ protected void dumpEscherStm(DirectoryNode escherDir) throws IOException {
+ byte[] data = getData(escherDir, "EscherStm");
+ System.out.println("");
+ System.out.println("EscherStm - " + data.length + " bytes long:");
+ if(data.length > 0)
+ dumpEscherStream(data);
+ }
+ protected void dumpEscherDelayStm(DirectoryNode escherDir) throws IOException {
+ byte[] data = getData(escherDir, "EscherDelayStm");
+ System.out.println("");
+ System.out.println("EscherDelayStm - " + data.length + " bytes long:");
+ if(data.length > 0)
+ dumpEscherStream(data);
+ }
+
+ public void dumpEnvelope() throws IOException {
+ byte[] data = getData(fs.getRoot(), "Envelope");
+
+ System.out.println("");
+ System.out.println("Envelope - " + data.length + " bytes long:");
+ }
+
+ public void dumpContents() throws IOException {
+ byte[] data = getData(fs.getRoot(), "Contents");
+
+ System.out.println("");
+ System.out.println("Contents - " + data.length + " bytes long:");
+
+ // 8 bytes, always seems to be
+ // E8 AC 2C 00 E8 03 05 01
+ // E8 AC 2C 00 E8 03 05 01
+
+ // 4 bytes - size of contents
+ // 13/15 00 00 01
+
+ // ....
+
+ // E8 03 08 08 0C 20 03 00 00 00 00 88 16 00 00 00 ..... ..........
+
+ // 01 18 27 00 03 20 00 00 E8 03 08 08 0C 20 03 00 ..'.. ....... ..
+
+ // 01 18 30 00 03 20 00 00
+ // E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
+ // 00 00 00 88 1E 00 00 00
+
+ // 01 18 31 00 03 20 00 00
+ // E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
+ // 00 00 00 88 1E 00 00 00
+
+ // 01 18 32 00 03 20 00 00
+ // E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
+ // 00 00 00 88 1E 00 00 00
+ }
+
+ public void dumpCONTENTSraw(DirectoryNode dir) throws IOException {
+ byte[] data = getData(dir, "CONTENTS");
+
+ System.out.println("");
+ System.out.println("CONTENTS - " + data.length + " bytes long:");
+
+ // Between the start and 0x200 we have
+ // CHNKINK(space) + 24 bytes
+ // 0x1800
+ // TEXT + 6 bytes
+ // TEXT + 8 bytes
+ // 0x1800
+ // STSH + 6 bytes
+ // STSH + 8 bytes
+ // 0x1800
+ // STSH + 6 bytes
+ // STSH + 8 bytes
+ // but towards 0x200 the pattern may
+ // break down a little bit
+
+ // After the second of a given type,
+ // it seems to be 4 bytes giving the start,
+ // then 4 bytes giving the length, then
+ // 18 00
+ System.out.println(
+ new String(data, 0, 8) +
+ dumpBytes(data, 8, 0x20-8)
+ );
+
+ int pos = 0x20;
+ boolean sixNotEight = true;
+ while(pos < 0x200) {
+ if(sixNotEight) {
+ System.out.println(
+ dumpBytes(data, pos, 2)
+ );
+ pos += 2;
+ }
+ String text = new String(data, pos, 4);
+ int blen = 8;
+ if(sixNotEight)
+ blen = 6;
+ System.out.println(
+ text + " " + dumpBytes(data, pos+4, blen)
+ );
+
+ pos += 4 + blen;
+ sixNotEight = ! sixNotEight;
+ }
+
+ // Text from 0x200 onwards until we get
+ // to \r(00)\n(00)(00)(00)
+ int textStop = -1;
+ for(int i=0x200; i 0) {
+ int len = (textStop - 0x200) / 2;
+ System.out.println("");
+ System.out.println(
+ StringUtil.getFromUnicodeLE(data, 0x200, len)
+ );
+ }
+
+ // The font list comes slightly later
+
+ // The hyperlinks may come before the fonts,
+ // or slightly in front
+ }
+ public void dumpCONTENTSguessed(DirectoryNode dir) throws IOException {
+ byte[] data = getData(dir, "CONTENTS");
+
+ System.out.println("");
+ System.out.println("CONTENTS - " + data.length + " bytes long:");
+
+ String[] startType = new String[20];
+ String[] endType = new String[20];
+ int[] optA = new int[20];
+ int[] optB = new int[20];
+ int[] optC = new int[20];
+ int[] from = new int[20];
+ int[] len = new int[20];
+
+ for(int i=0; i<20; i++) {
+ int offset = 0x20 + i*24;
+ if(data[offset] == 0x18 && data[offset+1] == 0x00) {
+ // Has data
+ startType[i] = new String(data, offset+2, 4);
+ optA[i] = LittleEndian.getUShort(data, offset+6);
+ optB[i] = LittleEndian.getUShort(data, offset+8);
+ optC[i] = LittleEndian.getUShort(data, offset+10);
+ endType[i] = new String(data, offset+12, 4);
+ from[i] = (int)LittleEndian.getUInt(data, offset+16);
+ len[i] = (int)LittleEndian.getUInt(data, offset+20);
+ } else {
+ // Doesn't have data
+ }
+ }
+
+ String text = StringUtil.getFromUnicodeLE(
+ data, from[0], len[0]/2
+ );
+
+ // Dump
+ for(int i=0; i<20; i++) {
+ String num = Integer.toString(i);
+ if(i < 10) {
+ num = "0" + i;
+ }
+ System.out.print(num + " ");
+
+ if(startType[i] == null) {
+ System.out.println("(not present)");
+ } else {
+ System.out.println(
+ "\t" +
+ startType[i] + " " +
+ optA[i] + " " +
+ optB[i] + " " +
+ optC[i]
+ );
+ System.out.println(
+ "\t" +
+ endType[i] + " " +
+ "from: " +
+ Integer.toHexString(from[i]) +
+ " (" + from[i] + ")" +
+ ", len: " +
+ Integer.toHexString(len[i]) +
+ " (" + len[i] + ")"
+ );
+ }
+ }
+
+ // Text
+ System.out.println("");
+ System.out.println("TEXT:");
+ System.out.println(text);
+ System.out.println("");
+
+ // All the others
+ for(int i=0; i<20; i++) {
+ if(startType[i] == null) {
+ continue;
+ }
+ int start = from[i];
+
+ System.out.println(
+ startType[i] + " -> " + endType[i] +
+ " @ " + Integer.toHexString(start) +
+ " (" + start + ")"
+ );
+ System.out.println("\t" + dumpBytes(data, start, 4));
+ System.out.println("\t" + dumpBytes(data, start+4, 4));
+ System.out.println("\t" + dumpBytes(data, start+8, 4));
+ System.out.println("\t(etc)");
+ }
+ }
+
+ protected void dump001CompObj(DirectoryNode dir) {
+ // TODO
+ }
+
+ public void dumpQuill() throws IOException {
+ DirectoryNode quillDir = (DirectoryNode)
+ fs.getRoot().getEntry("Quill");
+ DirectoryNode quillSubDir = (DirectoryNode)
+ quillDir.getEntry("QuillSub");
+
+ dump001CompObj(quillSubDir);
+ dumpCONTENTSraw(quillSubDir);
+ dumpCONTENTSguessed(quillSubDir);
+ }
+}
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.pub b/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.pub
new file mode 100755
index 0000000000000000000000000000000000000000..b870168319048c9e8631c2338eb937e6f8f62b5b
GIT binary patch
literal 72192
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