You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2008/10/31 19:37:21 UTC
svn commit: r709526 [1/2] - in /poi/branches/ooxml: ./
src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/
src/java/org/apache/poi/hssf/record/
src/java/org/apache/poi/hssf/record/aggregates/
src/java/org/apache/poi/ss/formula/ src/testcases/org/a...
Author: josh
Date: Fri Oct 31 11:37:16 2008
New Revision: 709526
URL: http://svn.apache.org/viewvc?rev=709526&view=rev
Log:
Merged revisions 709263-709264,709317 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk
........
r709263 | josh | 2008-10-30 15:07:26 -0700 (Thu, 30 Oct 2008) | 1 line
Removed dodgy superlcass implementation of Record.getRecordSize()
........
r709264 | josh | 2008-10-30 15:13:56 -0700 (Thu, 30 Oct 2008) | 1 line
Introduced Record.getDataSize() method
........
r709317 | josh | 2008-10-30 18:02:55 -0700 (Thu, 30 Oct 2008) | 1 line
converted getRecordSize methods to getDataSize
........
Added:
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
- copied unchanged from r709504, poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
Modified:
poi/branches/ooxml/ (props changed)
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BOFRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BackupRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BarRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BeginRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BlankRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CodepageRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ContinueRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CountryRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DBCellRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DSFRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVALRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DeltaRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FilePassRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FooterRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormulaRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FrameRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GridsetRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GutsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HCenterRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HeaderRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HideObjRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IndexRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IterationRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LabelRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LegendRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LineFormatRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/MMSRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/MulRKRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NoteRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NumberRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ObjRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PaletteRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PaneRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PasswordRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ProtectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RKRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/Record.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RefModeRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RowRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SCLRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SSTRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SelectionRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesListRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/StringRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/StyleRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/SupBookRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TabIdRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TextRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TickRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/UncalcedRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/UnitsRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/UnknownRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/VCenterRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
poi/branches/ooxml/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java (props changed)
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 31 11:37:16 2008
@@ -1 +1 @@
-/poi/trunk:693591-694881,695264-695420,695621,695649-709235
+/poi/trunk:693591-694881,695264-695420,695621,695649-709317
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 31 11:37:16 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-709235
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-709317
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java Fri Oct 31 11:37:16 2008
@@ -17,13 +17,12 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
-import org.apache.poi.hssf.record.Record;
/**
* A dummy record to indicate that we've now had the last
* cell record for this row.
*/
-public class LastCellOfRowDummyRecord extends Record {
+public final class LastCellOfRowDummyRecord extends DummyRecordBase {
private int row;
private int lastColumnNumber;
@@ -45,11 +44,4 @@
* for the row.
*/
public int getLastColumnNumber() { return lastColumnNumber; }
-
- public short getSid() {
- return -1;
- }
- public int serialize(int offset, byte[] data) {
- return -1;
- }
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java Fri Oct 31 11:37:16 2008
@@ -17,13 +17,12 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
-import org.apache.poi.hssf.record.Record;
/**
* A dummy record for when we're missing a cell in a row,
* but still want to trigger something
*/
-public class MissingCellDummyRecord extends Record {
+public final class MissingCellDummyRecord extends DummyRecordBase {
private int row;
private int column;
@@ -31,14 +30,6 @@
this.row = row;
this.column = column;
}
-
- public short getSid() {
- return -1;
- }
- public int serialize(int offset, byte[] data) {
- return -1;
- }
-
public int getRow() { return row; }
public int getColumn() { return column; }
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java Fri Oct 31 11:37:16 2008
@@ -17,27 +17,17 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordInputStream;
/**
* A dummy record for when we're missing a row, but still
* want to trigger something
*/
-public class MissingRowDummyRecord extends Record {
+public final class MissingRowDummyRecord extends DummyRecordBase {
private int rowNumber;
public MissingRowDummyRecord(int rowNumber) {
this.rowNumber = rowNumber;
}
-
- public short getSid() {
- return -1;
- }
- public int serialize(int offset, byte[] data) {
- return -1;
- }
-
public int getRowNumber() {
return rowNumber;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java Fri Oct 31 11:37:16 2008
@@ -130,48 +130,20 @@
}
return getRecordSize();
}
-
- public int getRecordSize()
- {
- if (escherRecords.size() == 0 && rawData != null)
- {
- return rawData.length + 4;
+ protected int getDataSize() {
+ if (escherRecords.size() == 0 && rawData != null) {
+ return rawData.length;
}
- else
+ int size = 0;
+ for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
{
- int size = 4;
- for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
- {
- EscherRecord r = (EscherRecord) iterator.next();
- size += r.getRecordSize();
- }
- return size;
+ EscherRecord r = (EscherRecord) iterator.next();
+ size += r.getRecordSize();
}
+ return size;
}
-//
-// /**
-// * Size of record (including 4 byte header)
-// */
-// public int getRecordSize()
-// {
-// if (escherRecords.size() == 0 && rawData != null)
-// {
-// return rawData.length;
-// }
-// else
-// {
-// collapseShapeInformation();
-//
-// int size = 4;
-// for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
-// {
-// EscherRecord r = (EscherRecord) iterator.next();
-// size += r.getRecordSize();
-// }
-// return size;
-// }
-// }
+
public abstract short getSid();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -110,9 +110,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 4 + 4 + 2 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 4 + 4 + 2 + 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AreaRecord.java Fri Oct 31 11:37:16 2008
@@ -75,9 +75,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -70,9 +70,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java Fri Oct 31 11:37:16 2008
@@ -142,9 +142,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisParentRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisParentRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisParentRecord.java Fri Oct 31 11:37:16 2008
@@ -96,9 +96,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 4 + 4 + 4 + 4;
+ protected int getDataSize() {
+ return 2 + 4 + 4 + 4 + 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisRecord.java Fri Oct 31 11:37:16 2008
@@ -97,9 +97,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 4 + 4 + 4 + 4;
+ protected int getDataSize() {
+ return 2 + 4 + 4 + 4 + 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java Fri Oct 31 11:37:16 2008
@@ -66,9 +66,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BOFRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BOFRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BOFRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BOFRecord.java Fri Oct 31 11:37:16 2008
@@ -286,9 +286,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 20;
+ protected int getDataSize() {
+ return 16;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BackupRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BackupRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BackupRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BackupRecord.java Fri Oct 31 11:37:16 2008
@@ -87,9 +87,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BarRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BarRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BarRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BarRecord.java Fri Oct 31 11:37:16 2008
@@ -92,9 +92,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BeginRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BeginRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BeginRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BeginRecord.java Fri Oct 31 11:37:16 2008
@@ -57,9 +57,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4;
+ protected int getDataSize() {
+ return 0;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BlankRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BlankRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BlankRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BlankRecord.java Fri Oct 31 11:37:16 2008
@@ -144,9 +144,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 10;
+ protected int getDataSize() {
+ return 6;
}
public Object clone() {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BookBoolRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BookBoolRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BookBoolRecord.java Fri Oct 31 11:37:16 2008
@@ -87,9 +87,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoolErrRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoolErrRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoolErrRecord.java Fri Oct 31 11:37:16 2008
@@ -34,7 +34,7 @@
private short field_3_xf_index;
private byte field_4_bBoolErr;
private byte field_5_fError;
-
+
/** Creates new BoolErrRecord */
public BoolErrRecord()
{
@@ -206,9 +206,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 12;
+ protected int getDataSize() {
+ return 8;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java Fri Oct 31 11:37:16 2008
@@ -59,9 +59,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 8;
+ protected int getDataSize() {
+ return 8;
}
public short getSid()
@@ -92,4 +91,4 @@
return rec;
}
-} // END OF CLA
\ No newline at end of file
+} // END OF C
\ No newline at end of file
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java Fri Oct 31 11:37:16 2008
@@ -156,7 +156,7 @@
return buffer.toString();
}
- private int getDataSize() {
+ protected int getDataSize() {
return 8 + field_5_sheetname.length() * (isMultibyte() ? 2 : 1);
}
@@ -179,10 +179,6 @@
return 4 + dataSize;
}
- public int getRecordSize() {
- return 4 + getDataSize();
- }
-
public short getSid() {
return sid;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java Fri Oct 31 11:37:16 2008
@@ -130,7 +130,7 @@
return buffer.toString();
}
- private int getDataSize() {
+ protected int getDataSize() {
return 4 // 2 short fields
+ CellRangeAddress.ENCODED_SIZE
+ field_4_cell_ranges.getSize();
@@ -151,10 +151,6 @@
return 4 + dataSize;
}
- public int getRecordSize() {
- return 4 + getDataSize();
- }
-
public short getSid()
{
return sid;
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java Fri Oct 31 11:37:16 2008
@@ -482,17 +482,14 @@
return recordsize;
}
-
- public int getRecordSize()
- {
- int retval =16+
+ protected int getDataSize() {
+ return 12 +
(containsFontFormattingBlock()?fontFormatting.getRawRecord().length:0)+
(containsBorderFormattingBlock()?8:0)+
(containsPatternFormattingBlock()?4:0)+
getFormulaSize(field_17_formula1)+
getFormulaSize(field_18_formula2)
;
- return retval;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNCountRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNCountRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNCountRecord.java Fri Oct 31 11:37:16 2008
@@ -28,7 +28,7 @@
public final class CRNCountRecord extends Record {
public final static short sid = 0x59;
- private static final short BASE_RECORD_SIZE = 4;
+ private static final short DATA_SIZE = 4;
private int field_1_number_crn_records;
@@ -65,14 +65,13 @@
public int serialize(int offset, byte [] data) {
LittleEndian.putShort(data, 0 + offset, sid);
- LittleEndian.putShort(data, 2 + offset, BASE_RECORD_SIZE);
+ LittleEndian.putShort(data, 2 + offset, DATA_SIZE);
LittleEndian.putShort(data, 4 + offset, (short)field_1_number_crn_records);
LittleEndian.putShort(data, 6 + offset, (short)field_2_sheet_table_index);
return getRecordSize();
}
-
- public int getRecordSize() {
- return BASE_RECORD_SIZE + 4;
+ protected int getDataSize() {
+ return DATA_SIZE;
}
/**
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CRNRecord.java Fri Oct 31 11:37:16 2008
@@ -63,7 +63,7 @@
sb.append("]");
return sb.toString();
}
- private int getDataSize() {
+ protected int getDataSize() {
return 4 + ConstantValueParser.getEncodedSize(field_4_constant_values);
}
@@ -80,10 +80,6 @@
return recSize;
}
- public int getRecordSize() {
- return getDataSize() + 4;
- }
-
/**
* return the non static version of the id for this record.
*/
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcCountRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcCountRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcCountRecord.java Fri Oct 31 11:37:16 2008
@@ -89,9 +89,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcModeRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcModeRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CalcModeRecord.java Fri Oct 31 11:37:16 2008
@@ -115,9 +115,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java Fri Oct 31 11:37:16 2008
@@ -97,9 +97,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -85,9 +85,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 22;
+ protected int getDataSize() {
+ return 18;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartRecord.java Fri Oct 31 11:37:16 2008
@@ -86,9 +86,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 4 + 4 + 4 + 4;
+ protected int getDataSize() {
+ return 4 + 4 + 4 + 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -88,9 +88,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + (4 * m_formats.size());
+ protected int getDataSize() {
+ return 2 + (4 * m_formats.size());
}
public short getSid() {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CodepageRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CodepageRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CodepageRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CodepageRecord.java Fri Oct 31 11:37:16 2008
@@ -96,9 +96,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java Fri Oct 31 11:37:16 2008
@@ -280,9 +280,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 16;
+ protected int getDataSize() {
+ return 12;
}
public String toString()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ContinueRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ContinueRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ContinueRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ContinueRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
@@ -31,20 +29,14 @@
*/
public final class ContinueRecord extends Record {
public final static short sid = 0x003C;
- private byte[] _data;
+ private byte[] _data;
public ContinueRecord(byte[] data) {
_data = data;
}
- /**
- * USE ONLY within "processContinue"
- */
- public byte [] serialize()
- {
- byte[] retval = new byte[ _data.length + 4 ];
- serialize(0, retval);
- return retval;
+ protected int getDataSize() {
+ return _data.length;
}
public int serialize(int offset, byte[] data) {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CountryRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CountryRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CountryRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CountryRecord.java Fri Oct 31 11:37:16 2008
@@ -117,9 +117,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 8;
+ protected int getDataSize() {
+ return 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DBCellRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DBCellRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DBCellRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DBCellRecord.java Fri Oct 31 11:37:16 2008
@@ -143,10 +143,8 @@
}
return getRecordSize();
}
-
- public int getRecordSize()
- {
- return 8 + (getNumCellOffsets() * 2);
+ protected int getDataSize() {
+ return 4 + (getNumCellOffsets() * 2);
}
/**
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DSFRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DSFRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DSFRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DSFRecord.java Fri Oct 31 11:37:16 2008
@@ -85,9 +85,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVALRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVALRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVALRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVALRecord.java Fri Oct 31 11:37:16 2008
@@ -164,9 +164,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 22;
+ protected int getDataSize() {
+ return 18;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DVRecord.java Fri Oct 31 11:37:16 2008
@@ -303,8 +303,8 @@
return 3 + str.length() * (StringUtil.hasMultibyte(str) ? 2 : 1);
}
- public int getRecordSize() {
- int size = 4+4+2+2+2+2;//header+options_field+first_formula_size+first_unused+sec_formula_size+sec+unused;
+ protected int getDataSize() {
+ int size = 4+2+2+2+2;//options_field+first_formula_size+first_unused+sec_formula_size+sec+unused;
size += getUnicodeStringSize(_promptTitle);
size += getUnicodeStringSize(_errorTitle);
size += getUnicodeStringSize(_promptText);
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DatRecord.java Fri Oct 31 11:37:16 2008
@@ -78,9 +78,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DataFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DataFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DataFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -93,9 +93,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java Fri Oct 31 11:37:16 2008
@@ -85,9 +85,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java Fri Oct 31 11:37:16 2008
@@ -80,9 +80,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java Fri Oct 31 11:37:16 2008
@@ -69,9 +69,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java Fri Oct 31 11:37:16 2008
@@ -110,9 +110,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 8;
+ protected int getDataSize() {
+ return 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DeltaRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DeltaRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DeltaRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DeltaRecord.java Fri Oct 31 11:37:16 2008
@@ -88,9 +88,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 12;
+ protected int getDataSize() {
+ return 8;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DimensionsRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DimensionsRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DimensionsRecord.java Fri Oct 31 11:37:16 2008
@@ -165,9 +165,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 18;
+ protected int getDataSize() {
+ return 14;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java Fri Oct 31 11:37:16 2008
@@ -26,8 +26,7 @@
import java.util.List;
-public class DrawingGroupRecord extends AbstractEscherHolderRecord
-{
+public final class DrawingGroupRecord extends AbstractEscherHolderRecord {
public static final short sid = 0xEB;
static final int MAX_RECORD_SIZE = 8228;
@@ -82,30 +81,25 @@
public void processChildRecords() {
convertRawBytesToEscherRecords();
}
-
- public int getRecordSize()
- {
- return grossSizeFromDataSize( getRawDataSize() );
+ protected int getDataSize() {
+ // TODO - convert this to a RecordAggregate
+ return grossSizeFromDataSize( getRawDataSize() ) - 4;
}
- public int getRawDataSize()
- {
+ private int getRawDataSize() {
List escherRecords = getEscherRecords();
byte[] rawData = getRawData();
if (escherRecords.size() == 0 && rawData != null)
{
return rawData.length;
}
- else
+ int size = 0;
+ for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
{
- int size = 0;
- for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
- {
- EscherRecord r = (EscherRecord) iterator.next();
- size += r.getRecordSize();
- }
- return size;
+ EscherRecord r = (EscherRecord) iterator.next();
+ size += r.getRecordSize();
}
+ return size;
}
static int grossSizeFromDataSize(int dataSize)
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecord.java Fri Oct 31 11:37:16 2008
@@ -14,19 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
+
package org.apache.poi.hssf.record;
import org.apache.poi.util.LittleEndian;
-public class DrawingRecord extends Record
-{
- public static final short sid = 0xEC;
+public final class DrawingRecord extends Record {
+ public static final short sid = 0x00EC;
+
+ private static final byte[] EMPTY_BYTE_ARRAY = { };
private byte[] recordData;
private byte[] contd;
- public DrawingRecord()
- {
+ public DrawingRecord() {
+ recordData = EMPTY_BYTE_ARRAY;
}
public DrawingRecord( RecordInputStream in )
@@ -54,13 +56,10 @@
}
return getRecordSize();
}
+ protected int getDataSize() {
+ int retval = 0;
- public int getRecordSize()
- {
- int retval = 4;
-
- if (recordData != null)
- {
+ if (recordData != null) {
retval += recordData.length;
}
return retval;
@@ -91,10 +90,8 @@
public Object clone() {
DrawingRecord rec = new DrawingRecord();
- if (recordData != null) {
- rec.recordData = new byte[ recordData.length ];
- System.arraycopy(recordData, 0, rec.recordData, 0, recordData.length);
- }
+ rec.recordData = new byte[ recordData.length ];
+ System.arraycopy(recordData, 0, rec.recordData, 0, recordData.length);
if (contd != null) {
System.arraycopy(contd, 0, rec.contd, 0, contd.length);
rec.contd = new byte[ contd.length ];
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java Fri Oct 31 11:37:16 2008
@@ -23,9 +23,7 @@
* This is purely for the biff viewer. During normal operations we don't want
* to be seeing this.
*/
-public class DrawingRecordForBiffViewer
- extends AbstractEscherHolderRecord
-{
+public final class DrawingRecordForBiffViewer extends AbstractEscherHolderRecord {
public static final short sid = 0xEC;
public DrawingRecordForBiffViewer()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java Fri Oct 31 11:37:16 2008
@@ -17,8 +17,7 @@
package org.apache.poi.hssf.record;
-public class DrawingSelectionRecord extends AbstractEscherHolderRecord
-{
+public final class DrawingSelectionRecord extends AbstractEscherHolderRecord {
public static final short sid = 0xED;
public DrawingSelectionRecord()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java Fri Oct 31 11:37:16 2008
@@ -63,9 +63,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return ENCODED_SIZE;
+ protected int getDataSize() {
+ return ENCODED_SIZE - 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java Fri Oct 31 11:37:16 2008
@@ -58,9 +58,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4;
+ protected int getDataSize() {
+ return 0;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EscherAggregate.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EscherAggregate.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EscherAggregate.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EscherAggregate.java Fri Oct 31 11:37:16 2008
@@ -498,8 +498,8 @@
return size;
}
- public int getRecordSize()
- {
+ protected int getDataSize() {
+ // TODO - convert this to RecordAggregate
convertUserModelToRecords();
List records = getEscherRecords();
int rawEscherSize = getEscherRecordSize( records );
@@ -516,7 +516,7 @@
Record r = (Record) iterator.next();
tailRecordSize += r.getRecordSize();
}
- return drawingRecordSize + objRecordSize + tailRecordSize;
+ return drawingRecordSize + objRecordSize + tailRecordSize - 4;
}
/**
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java Fri Oct 31 11:37:16 2008
@@ -100,9 +100,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 8;
+ protected int getDataSize() {
+ return 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,13 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
-import org.apache.poi.util.LittleEndian;
-
import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.poi.util.LittleEndian;
/**
* Title: Extended Static String Table<P>
@@ -35,17 +34,14 @@
* @version 2.0-pre
* @see org.apache.poi.hssf.record.ExtSSTInfoSubRecord
*/
-
-public class ExtSSTRecord
- extends Record
-{
+public final class ExtSSTRecord extends Record {
+ public final static short sid = 0x00FF;
public static final int DEFAULT_BUCKET_SIZE = 8;
- //Cant seem to find this documented but from the biffviewer it is clear that
+ //Can't seem to find this documented but from the biffviewer it is clear that
//Excel only records the indexes for the first 128 buckets.
public static final int MAX_BUCKETS = 128;
- public final static short sid = 0xff;
private short field_1_strings_per_bucket = DEFAULT_BUCKET_SIZE;
- private ArrayList field_2_sst_info;
+ private List field_2_sst_info;
public ExtSSTRecord()
@@ -128,10 +124,8 @@
}
return pos;
}
-
- public int getRecordSize()
- {
- return 6 + 8*getNumInfoRecords();
+ protected int getDataSize() {
+ return 2 + 8*getNumInfoRecords();
}
public static final int getNumberOfInfoRecsForStrings(int numStrings) {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java Fri Oct 31 11:37:16 2008
@@ -1787,9 +1787,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 24;
+ protected int getDataSize() {
+ return 20;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java Fri Oct 31 11:37:16 2008
@@ -153,8 +153,7 @@
return sb.toString();
}
-
- private int getDataSize() {
+ protected int getDataSize() {
return 2 + _list.size() * RefSubRecord.ENCODED_SIZE;
}
@@ -189,10 +188,6 @@
return (RefSubRecord) _list.get(i);
}
- public int getRecordSize() {
- return 4 + getDataSize();
- }
-
/**
* return the non static version of the id for this record.
*/
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java Fri Oct 31 11:37:16 2008
@@ -83,7 +83,7 @@
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()) {
@@ -120,10 +120,6 @@
return recSize;
}
- public int getRecordSize(){
- return 4 + getDataSize();
- }
-
public ExternalNameRecord(RecordInputStream in) {
field_1_option_flag = in.readShort();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FilePassRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FilePassRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FilePassRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FilePassRecord.java Fri Oct 31 11:37:16 2008
@@ -68,9 +68,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 8;
+ protected int getDataSize() {
+ return 4;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FileSharingRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FileSharingRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FileSharingRecord.java Fri Oct 31 11:37:16 2008
@@ -153,12 +153,12 @@
return getRecordSize();
}
- public int getRecordSize() {
+ protected int getDataSize() {
short nameLen = getUsernameLength();
if (nameLen < 1) {
- return 10;
+ return 6;
}
- return 11+nameLen;
+ return 7+nameLen;
}
public short getSid() {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java Fri Oct 31 11:37:16 2008
@@ -93,9 +93,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontBasisRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontBasisRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontBasisRecord.java Fri Oct 31 11:37:16 2008
@@ -94,9 +94,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2 + 2 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2 + 2 + 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontIndexRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontIndexRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontIndexRecord.java Fri Oct 31 11:37:16 2008
@@ -66,9 +66,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FontRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
@@ -29,14 +27,9 @@
* Description: An element in the Font Table<P>
* REFERENCE: PG 315 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
* @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
*/
-
-public class FontRecord
- extends Record
-{
- public final static short sid =
- 0x31; // docs are wrong (0x231 Microsoft Support site article Q184647)
+public final class FontRecord extends Record {
+ public final static short sid = 0x0031; // docs are wrong (0x231 Microsoft Support site article Q184647)
public final static short SS_NONE = 0;
public final static short SS_SUPER = 1;
public final static short SS_SUB = 2;
@@ -509,12 +502,10 @@
}
return getRecordSize();
}
-
- public int getRecordSize()
- {
+ protected int getDataSize() {
// Note - no matter the original, we always
// re-serialise the font name as unicode
- return (getFontNameLength() * 2) + 20;
+ return 16 + getFontNameLength() * 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FooterRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FooterRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FooterRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FooterRecord.java Fri Oct 31 11:37:16 2008
@@ -180,16 +180,13 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- int retval = 4;
+ protected int getDataSize() {
+ int retval = 0;
- if (getFooterLength() > 0)
- {
+ if (getFooterLength() > 0) {
retval+=3; // [Shawn] Fixed for two null bytes in the length
}
- return (isMultibyte() ?
- (retval + getFooterLength()*2) : (retval + getFooterLength()));
+ return retval + getFooterLength() * (isMultibyte() ? 2 : 1);
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormatRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
@@ -29,13 +27,9 @@
* REFERENCE: PG 317 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Shawn M. Laubach (slaubach at apache dot org)
- * @version 2.0-pre
*/
-
-public class FormatRecord
- extends Record
-{
- public final static short sid = 0x41e;
+public final class FormatRecord extends Record {
+ public final static short sid = 0x041E;
private short field_1_index_code;
private short field_3_unicode_len; // unicode string length
@@ -199,10 +193,8 @@
return getRecordSize();
}
-
- public int getRecordSize()
- {
- return 9 + ( ( field_3_unicode_flag ) ? 2 * field_3_unicode_len : field_3_unicode_len );
+ protected int getDataSize() {
+ return 5 + field_3_unicode_len * (field_3_unicode_flag ? 2 : 1);
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormulaRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormulaRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormulaRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FormulaRecord.java Fri Oct 31 11:37:16 2008
@@ -353,7 +353,7 @@
return sid;
}
- private int getDataSize() {
+ protected int getDataSize() {
return FIXED_SIZE + field_8_parsed_expr.getEncodedSize();
}
public int serialize(int offset, byte [] data) {
@@ -380,10 +380,6 @@
return recSize;
}
- public int getRecordSize() {
- return 4 + getDataSize();
- }
-
public String toString() {
StringBuffer sb = new StringBuffer();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FrameRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FrameRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FrameRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/FrameRecord.java Fri Oct 31 11:37:16 2008
@@ -83,9 +83,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4 + 2 + 2;
+ protected int getDataSize() {
+ return 2 + 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GridsetRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GridsetRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GridsetRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GridsetRecord.java Fri Oct 31 11:37:16 2008
@@ -97,9 +97,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GutsRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GutsRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GutsRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/GutsRecord.java Fri Oct 31 11:37:16 2008
@@ -167,9 +167,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 12;
+ protected int getDataSize() {
+ return 8;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HCenterRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HCenterRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HCenterRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HCenterRecord.java Fri Oct 31 11:37:16 2008
@@ -86,9 +86,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HeaderRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HeaderRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HeaderRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HeaderRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
@@ -29,13 +27,9 @@
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Shawn Laubach (slaubach at apache dot org) Modified 3/14/02
* @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
*/
-
-public class HeaderRecord
- extends Record
-{
- public final static short sid = 0x14;
+public final class HeaderRecord extends Record {
+ public final static short sid = 0x0014;
private byte field_1_header_len;
private byte field_2_reserved;
private byte field_3_unicode_flag;
@@ -180,16 +174,13 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- int retval = 4;
+ protected int getDataSize() {
+ int retval = 0;
- if (getHeaderLength() != 0)
- {
+ if (getHeaderLength() != 0) {
retval+=3; // [Shawn] Fixed for two null bytes in the length
}
- return (isMultibyte() ?
- (retval + getHeaderLength()*2) : (retval + getHeaderLength()));
+ return retval + getHeaderLength() * (isMultibyte() ? 2 : 1);
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HideObjRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HideObjRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HideObjRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HideObjRecord.java Fri Oct 31 11:37:16 2008
@@ -95,9 +95,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java Fri Oct 31 11:37:16 2008
@@ -31,7 +31,7 @@
* @author Mark Hissink Muller <a href="mailto:mark@hissinkmuller.nl >mark&064;hissinkmuller.nl</a>
* @author Yegor Kozlov (yegor at apache dot org)
*/
-public class HyperlinkRecord extends Record {
+public final class HyperlinkRecord extends Record {
/**
* Link flags
*/
@@ -405,9 +405,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- int size = 4;
+ protected int getDataSize() {
+ int size = 0;
size += 2 + 2 + 2 + 2; //rwFirst, rwLast, colFirst, colLast
size += guid.length;
size += 4; //label_opts
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IndexRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IndexRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IndexRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IndexRecord.java Fri Oct 31 11:37:16 2008
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
@@ -30,13 +28,9 @@
* REFERENCE: PG 323 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
*/
-
-public class IndexRecord
- extends Record
-{
- public final static short sid = 0x20B;
+public class IndexRecord extends Record {
+ public final static short sid = 0x020B;
public final static int DBCELL_CAPACITY = 30;
public int field_1_zero; // reserved must be 0
public int field_2_first_row; // first row on the sheet
@@ -146,9 +140,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 20 + (getNumDbcells() * 4);
+ protected int getDataSize() {
+ return 16 + (getNumDbcells() * 4);
}
/** Returns the size of an INdexRecord when it needs to index the specified number of blocks
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java Fri Oct 31 11:37:16 2008
@@ -58,9 +58,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 4;
+ protected int getDataSize() {
+ return 0;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java Fri Oct 31 11:37:16 2008
@@ -94,9 +94,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IterationRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IterationRecord.java?rev=709526&r1=709525&r2=709526&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IterationRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/IterationRecord.java Fri Oct 31 11:37:16 2008
@@ -95,9 +95,8 @@
return getRecordSize();
}
- public int getRecordSize()
- {
- return 6;
+ protected int getDataSize() {
+ return 2;
}
public short getSid()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org