Introduced Record.getDataSize() method

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

diff --git a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
index 036de6b2dfe91d4586873b80cfb32d11c296eb3a..ca369bd8b957a3c0d9d631d241c331c0ee52c719 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
@@ -156,7 +156,7 @@ public final class BoundSheetRecord extends Record {
                return buffer.toString();
        }
        
-       private int getDataSize() {
+       protected int getDataSize() {
                return 8 + field_5_sheetname.length() * (isMultibyte() ? 2 : 1);
        }
 

diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index 47fba0b955b11851b90acc7fd2e7a5026aa544ac..8988e0652698152e76dde47f49bf903c3210a43a 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
@@ -130,7 +130,7 @@ public final class CFHeaderRecord extends Record {
                return buffer.toString();
        }
 
-       private int getDataSize() {
+       protected int getDataSize() {
                return 4 // 2 short fields
                        + CellRangeAddress.ENCODED_SIZE
                        + field_4_cell_ranges.getSize();

diff --git a/src/java/org/apache/poi/hssf/record/CRNRecord.java b/src/java/org/apache/poi/hssf/record/CRNRecord.java
index 050076cca27e362635e5f2df7ee492a6bad79ee7..fffefe2b45e8edffb070b9cd1dbf0f749f4cda9f 100755 (executable)
--- a/src/java/org/apache/poi/hssf/record/CRNRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CRNRecord.java
@@ -63,7 +63,7 @@ public final class CRNRecord extends Record {
                sb.append("]");
                return sb.toString();
        }
-       private int getDataSize() {
+       protected int getDataSize() {
                return 4 + ConstantValueParser.getEncodedSize(field_4_constant_values);
        }
 

diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
index f6266cfa3511f1d2181685de68aa70b7f00336c8..baa136c2311bd9044ce7cd3b98487cbe2bfdea4d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
@@ -153,8 +153,7 @@ public class ExternSheetRecord extends Record {
                return sb.toString();
        }
        
-       
-       private int getDataSize() {
+       protected int getDataSize() {
                return 2 + _list.size() * RefSubRecord.ENCODED_SIZE;
        }
        

diff --git a/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java b/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
index a3dfe575c18a73fa9830afe4543f8409664259d1..eb597aeb299560a1dde864825b29054c22261faf 100755 (executable)
--- a/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
@@ -83,7 +83,7 @@ public final class ExternalNameRecord extends Record {
                return field_4_name;
        }
 
-       private int getDataSize(){
+       protected int getDataSize(){
                int result = 3 * 2  // 3 short fields
                        + 2 + field_4_name.length(); // nameLen and name
                if(hasFormula()) {

diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
index e51ed77a96705cd125d424bbfdc10501af89082a..8c4781196673d98d7f26b4862624602fc473ed7c 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
@@ -353,7 +353,7 @@ public final class FormulaRecord extends Record implements CellValueRecordInterf
                return sid;
        }
 
-       private int getDataSize() {
+       protected int getDataSize() {
                return FIXED_SIZE + field_8_parsed_expr.getEncodedSize();
        }
        public int serialize(int offset, byte [] data) {

diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java
index 538b1ae9f192009685cbd919faac18bff41c2780..b96914e8987a9c70aeeef59608a79bded7b75861 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java
@@ -119,7 +119,7 @@ public final class ObjRecord extends Record {
                return sb.toString();
        }
        
-       private int getDataSize() {
+       protected int getDataSize() {
                if (_uninterpretedData != null) {
                        return _uninterpretedData.length;
                }

diff --git a/src/java/org/apache/poi/hssf/record/PageBreakRecord.java b/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
index 654439f31609cfbe5a6e9e97ddbff265ff96dcc2..c1b17674371383520305d68917c51de21b123b4d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
@@ -97,7 +97,7 @@ public abstract class PageBreakRecord extends Record {
 
     }
 
-    private int getDataSize() {
+    protected int getDataSize() {
         return 2 + _breaks.size() * Break.ENCODED_SIZE;
     }
     public int getRecordSize() {

diff --git a/src/java/org/apache/poi/hssf/record/Record.java b/src/java/org/apache/poi/hssf/record/Record.java
index 310cb28b2a465a548a257ab1e2b5a15996d2d230..56f6deb6a29ba3ae4d27c35d73e2015a80301ec9 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/Record.java
+++ b/src/java/org/apache/poi/hssf/record/Record.java
@@ -54,6 +54,15 @@ public abstract class Record extends RecordBase {
         return retval;
     }
 
+    /**
+     * @return the size of the data portion of this record 
+     * (does not include initial 4 bytes for sid and size)
+     */
+    protected int getDataSize() {
+       // implementation is currently a hack
+       // will eventually swap this out
+       return getRecordSize() - 4;
+    }
     /**
      * get a string representation of the record (for biffview/debugging)
      */

diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
index ca2bf22fc14e734ec46a25401b2bed8539d1d555..5dad6e1862dafa3cef5edec9824d5422d4452df4 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
@@ -143,7 +143,7 @@ public final class SelectionRecord extends Record {
         buffer.append("[/SELECTION]\n");
         return buffer.toString();
     }
-    private int getDataSize() {
+    protected int getDataSize() {
         return 9 // 1 byte + 4 shorts 
             + CellRangeAddress8Bit.getEncodedSize(field_6_refs.length);
     }

diff --git a/src/java/org/apache/poi/hssf/record/StyleRecord.java b/src/java/org/apache/poi/hssf/record/StyleRecord.java
index ad740e9b2e43ac2840920c515506925ce7f75795..f1ae0ab0fbbc782f0c0cd0552860a7255c8d5aab 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/StyleRecord.java
+++ b/src/java/org/apache/poi/hssf/record/StyleRecord.java
@@ -158,7 +158,7 @@ public final class StyleRecord extends Record {
        }
 
        
-       private int getDataSize() {
+       protected int getDataSize() {
                if (isBuiltin()) {
                        return 4; // short, byte, byte
                }

diff --git a/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/src/java/org/apache/poi/hssf/record/SupBookRecord.java
index 78d77c5cbf6ea84e85eccdcc89db661e4f59a929..067d9d07a7a65c9812d4f967ebb3d8e4e5da7a92 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SupBookRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SupBookRecord.java
@@ -138,7 +138,7 @@ public final class SupBookRecord extends Record {
         sb.append("]");
         return sb.toString();
     }
-    private int getDataSize() {
+    protected int getDataSize() {
         if(!isExternalReferences()) {
             return SMALL_RECORD_SIZE;
         }

diff --git a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java b/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
index 4bb065e91e23a2f6eeee58b9d074e060bed8dbf7..3b4ac6bb7ecb253cdd94c6d4c8d6472fccafe715 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
@@ -167,7 +167,7 @@ public final class TextObjectRecord extends Record {
         * Only for the current record. does not include any subsequent Continue
         * records
         */
-       private int getDataSize() {
+       protected int getDataSize() {
                int result = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4;
                if (_linkRefPtg != null) {
                        result += 2 // formula size