Apply patch from bug #52035 - Fix signed issue with very large word 6 files

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1183629 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 45c89496038a30111590caf8676874c1be4cc908..4e29144f8a9c2b4fe56a8bb0a702eba3800a361a 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta5" date="2011-??-??">
+           <action dev="poi-developers" type="fix">52035 - Fix signed issue with very large word 6 files</action>
            <action dev="poi-developers" type="fix">51949 - Avoid NPE on double close of ZipFileZipEntrySource</action>
            <action dev="poi-developers" type="fix">51950 - XWPF fix for footnotes not always being present in a document</action>
            <action dev="poi-developers" type="fix">51963 - Correct AreaReference handling of references containing a sheet name which includes a comma</action>

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
index dff5f3d7080fdbd47af9423ab40d5e600cea79d1..4b9038d4f713a0891c3be308060034ec414e5dd5 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
@@ -53,7 +53,7 @@ public final class OldCHPBinTable extends CHPBinTable
     {
       GenericPropertyNode node = binTable.getProperty(x);
 
-      int pageNum = LittleEndian.getShort(node.getBytes());
+      int pageNum = LittleEndian.getUShort(node.getBytes());
       int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
 
       CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(documentStream,

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
index 088ca33f29233bec5527dbcdd9fafbdaf0b46bb8..658e6671564fc87d73f132b1c934f7b6349ca8ea 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
@@ -45,7 +45,7 @@ public final class OldPAPBinTable extends PAPBinTable
     {
       GenericPropertyNode node = binTable.getProperty(x);
 
-      int pageNum = LittleEndian.getShort(node.getBytes());
+      int pageNum = LittleEndian.getUShort(node.getBytes());
       int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
 
       PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(documentStream,