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/09/30 08:42:32 UTC
svn commit: r700359 [1/4] - in /poi/branches/ooxml: ./
src/documentation/content/xdocs/
src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/
src/java/org/apache/poi/hssf/model/ src/java/org/apache/poi/hssf/record/
src/java/org/apache/poi/hssf/userm...
Author: josh
Date: Mon Sep 29 23:42:27 2008
New Revision: 700359
URL: http://svn.apache.org/viewvc?rev=700359&view=rev
Log:
Merged revisions 700280,700304,700327,700356 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk
........
r700280 | josh | 2008-09-29 15:04:20 -0700 (Mon, 29 Sep 2008) | 1 line
Fix for bug 45876 - allowed BoundSheetRecord to take sheet names longer than 31 chars
........
r700304 | josh | 2008-09-29 16:12:53 -0700 (Mon, 29 Sep 2008) | 1 line
Updated formula evaluator documentation due to bugzilla 45768
........
r700327 | josh | 2008-09-29 19:30:53 -0700 (Mon, 29 Sep 2008) | 1 line
Removed validateSid method from Record classes
........
r700356 | josh | 2008-09-29 23:18:44 -0700 (Mon, 29 Sep 2008) | 1 line
Refactored fillFields() method into constructor in Record class hierarchy
........
Modified:
poi/branches/ooxml/ (props changed)
poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
poi/branches/ooxml/src/documentation/content/xdocs/status.xml
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/model/Workbook.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/CommonObjectDataSubRecord.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/DrawingRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EOFRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EndSubRecord.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/GroupMarkerSubRecord.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/HorizontalPageBreakRecord.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/LinkedDataFormulaField.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/NoteStructureSubRecord.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/SubRecord.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/TextObjectBaseRecord.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/UnicodeString.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/VerticalPageBreakRecord.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/usermodel/HSSFFormulaEvaluator.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestChartRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTextRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTickRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 29 23:42:27 2008
@@ -1 +1 @@
-/poi/trunk:693591-694881,695264-695420,695621,695649-700204
+/poi/trunk:693591-694881,695264-695420,695621,695649-700356
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 29 23:42:27 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-700204
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-700356
Modified: poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/changes.xml?rev=700359&r1=700358&r2=700359&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/changes.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/changes.xml Mon Sep 29 23:42:27 2008
@@ -67,6 +67,7 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.2-alpha1" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="fix">45876 - fixed BoundSheetRecord to allow sheet names longer than 31 chars</action>
<action dev="POI-DEVELOPERS" type="add">45890 - fixed HSSFSheet.shiftRows to also update conditional formats</action>
<action dev="POI-DEVELOPERS" type="add">45865 modified Formula Parser/Evaluator to handle cross-worksheet formulas</action>
<action dev="POI-DEVELOPERS" type="add">Optimised the FormulaEvaluator to take cell dependencies into account</action>
Modified: poi/branches/ooxml/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/status.xml?rev=700359&r1=700358&r2=700359&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/status.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/status.xml Mon Sep 29 23:42:27 2008
@@ -64,6 +64,7 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.2-alpha1" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="fix">45876 - fixed BoundSheetRecord to allow sheet names longer than 31 chars</action>
<action dev="POI-DEVELOPERS" type="add">45890 - fixed HSSFSheet.shiftRows to also update conditional formats</action>
<action dev="POI-DEVELOPERS" type="add">45865 modified Formula Parser/Evaluator to handle cross-worksheet formulas</action>
<action dev="POI-DEVELOPERS" type="add">Optimised the FormulaEvaluator to take cell dependencies into account</action>
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -18,7 +18,6 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordInputStream;
/**
* A dummy record to indicate that we've now had the last
@@ -47,15 +46,10 @@
*/
public int getLastColumnNumber() { return lastColumnNumber; }
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
-
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -18,7 +18,6 @@
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 cell in a row,
@@ -33,16 +32,12 @@
this.column = column;
}
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -31,16 +31,12 @@
this.rowNumber = rowNumber;
}
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
public int getRowNumber() {
return rowNumber;
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/model/Workbook.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/model/Workbook.java?rev=700359&r1=700358&r2=700359&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/model/Workbook.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/model/Workbook.java Mon Sep 29 23:42:27 2008
@@ -55,6 +55,12 @@
* @version 1.0-pre
*/
public final class Workbook implements Model {
+ /**
+ * Excel silently truncates long sheet names to 31 chars.
+ * This constant is used to ensure uniqueness in the first 31 chars
+ */
+ private static final int MAX_SENSITIVE_SHEET_NAME_LEN = 31;
+
private static final int DEBUG = POILogger.DEBUG;
/**
@@ -488,32 +494,43 @@
/**
* sets the name for a given sheet. If the boundsheet record doesn't exist and
- * its only one more than we have, go ahead and create it. If its > 1 more than
+ * its only one more than we have, go ahead and create it. If it's > 1 more than
* we have, except
*
* @param sheetnum the sheet number (0 based)
* @param sheetname the name for the sheet
*/
- public void setSheetName(int sheetnum, String sheetname ) {
+ public void setSheetName(int sheetnum, String sheetname) {
checkSheets(sheetnum);
BoundSheetRecord sheet = (BoundSheetRecord)boundsheets.get( sheetnum );
sheet.setSheetname(sheetname);
}
/**
- * Determines whether a workbook contains the provided sheet name.
+ * Determines whether a workbook contains the provided sheet name. For the purpose of
+ * comparison, long names are truncated to 31 chars.
*
* @param name the name to test (case insensitive match)
* @param excludeSheetIdx the sheet to exclude from the check or -1 to include all sheets in the check.
* @return true if the sheet contains the name, false otherwise.
*/
- public boolean doesContainsSheetName( String name, int excludeSheetIdx )
- {
- for ( int i = 0; i < boundsheets.size(); i++ )
- {
+ public boolean doesContainsSheetName(String name, int excludeSheetIdx) {
+ String aName = name;
+ if (aName.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
+ aName = aName.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
+ }
+ for (int i = 0; i < boundsheets.size(); i++) {
BoundSheetRecord boundSheetRecord = getBoundSheetRec(i);
- if (excludeSheetIdx != i && name.equalsIgnoreCase(boundSheetRecord.getSheetname()))
+ if (excludeSheetIdx == i) {
+ continue;
+ }
+ String bName = boundSheetRecord.getSheetname();
+ if (bName.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
+ bName = bName.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
+ }
+ if (aName.equalsIgnoreCase(bName)) {
return true;
+ }
}
return false;
}
@@ -1954,9 +1971,9 @@
return (short)getOrCreateLinkTable().checkExternSheet(sheetNumber);
}
- public int getExternalSheetIndex(String workbookName, String sheetName) {
- return getOrCreateLinkTable().getExternalSheetIndex(workbookName, sheetName);
- }
+ public int getExternalSheetIndex(String workbookName, String sheetName) {
+ return getOrCreateLinkTable().getExternalSheetIndex(workbookName, sheetName);
+ }
/** gets the total number of names
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -57,32 +57,8 @@
escherRecords = new ArrayList();
}
- /**
- * Constructs a Bar record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
public AbstractEscherHolderRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != getSid())
- {
- throw new RecordFormatException("Not an escher record! (sid was " + id + ", expecting " + getSid() + ")");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
escherRecords = new ArrayList();
if (! DESERIALISE )
{
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -48,33 +48,8 @@
}
- /**
- * Constructs a AreaFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AreaFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a AreaFormat record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_foregroundColor = in.readInt();
field_2_backgroundColor = in.readInt();
field_3_pattern = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -42,33 +42,8 @@
}
- /**
- * Constructs a Area record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AreaRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a Area record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_formatFlags = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -46,33 +46,8 @@
}
- /**
- * Constructs a AxisLineFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisLineFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a AxisLineFormat record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -57,33 +57,8 @@
}
- /**
- * Constructs a AxisOptions record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisOptionsRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a AxisOptions record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_minimumCategory = in.readShort();
field_2_maximumCategory = in.readShort();
field_3_majorUnitValue = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -48,33 +48,8 @@
}
- /**
- * Constructs a AxisParent record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisParentRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a AxisParent record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
field_2_x = in.readInt();
field_3_y = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -49,33 +49,8 @@
}
- /**
- * Constructs a Axis record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a Axis record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
field_2_reserved1 = in.readInt();
field_3_reserved2 = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -42,33 +42,8 @@
}
- /**
- * Constructs a AxisUsed record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisUsedRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a AxisUsed record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_numAxis = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -86,28 +86,8 @@
{
}
- /**
- * Constructs a BOFRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BOFRecord(RecordInputStream in)
{
- super(in);
-
- // fillFields(data,size);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A BOF RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_version = in.readShort();
field_2_type = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -40,26 +40,8 @@
{
}
- /**
- * Constructs a BackupRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BackupRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A BACKUP RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_backup = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -47,33 +47,8 @@
}
- /**
- * Constructs a Bar record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public BarRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a Bar record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_barSpace = in.readShort();
field_2_categorySpace = in.readShort();
field_3_formatFlags = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 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,10 +27,7 @@
*
* @author Glen Stampoultzis (glens at apache.org)
*/
-
-public class BeginRecord
- extends Record
-{
+public class BeginRecord extends Record {
public static final short sid = 0x1033;
public BeginRecord()
@@ -40,25 +35,10 @@
}
/**
- * Constructs a BeginRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
+ * @param in unused (since this record has no data)
*/
-
public BeginRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A BEGIN RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
@@ -72,9 +52,8 @@
public int serialize(int offset, byte [] data)
{
- LittleEndian.putShort(data, 0 + offset, sid);
- LittleEndian.putShort(data, 2 + offset,
- (( short ) 0)); // no record info
+ LittleEndian.putUShort(data, 0 + offset, sid);
+ LittleEndian.putUShort(data, 2 + offset, 0); // no record info
return getRecordSize();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -39,37 +39,14 @@
{
}
- /**
- * Constructs a BlankRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
public BlankRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_row = in.readUShort();
field_2_col = in.readShort();
field_3_xf = in.readShort();
}
/**
- * called by constructor, should throw runtime exception in the event of a
- * record passed with a differing ID.
- *
- * @param id alleged id for this record
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A BLANKRECORD!");
- }
- }
-
- /**
* set the row this cell occurs on
* @param row the row this cell occurs within
*/
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -40,26 +40,8 @@
{
}
- /**
- * Constructs a BookBoolRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BookBoolRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A BOOKBOOL RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_save_link_values = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -41,20 +41,10 @@
}
/**
- * Constructs a BoolErr record and sets its fields appropriately.
- *
* @param in the RecordInputstream to read the record from
*/
public BoolErrRecord(RecordInputStream in)
{
- super(in);
- }
-
- /**
- * @param in the RecordInputstream to read the record from
- */
- protected void fillFields(RecordInputStream in)
- {
//field_1_row = LittleEndian.getShort(data, 0 + offset);
field_1_row = in.readUShort();
field_2_column = in.readShort();
@@ -221,20 +211,6 @@
return 12;
}
- /**
- * called by constructor, should throw runtime exception in the event of a
- * record passed with a differing ID.
- *
- * @param id alleged id for this record
- */
- protected void validateSid(short id)
- {
- if (id != BoolErrRecord.sid)
- {
- throw new RecordFormatException("Not a valid BoolErrRecord");
- }
- }
-
public short getSid()
{
return sid;
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -39,31 +39,8 @@
}
- /**
- * Constructs a BottomMargin record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
public BottomMarginRecord( RecordInputStream in )
{
- super( in );
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid( short id )
- {
- if ( id != sid )
- {
- throw new RecordFormatException( "Not a BottomMargin record" );
- }
- }
-
- protected void fillFields( RecordInputStream in )
- {
field_1_margin = in.readDouble();
}
@@ -121,4 +98,4 @@
return rec;
}
-} // END OF CLASS
+} // END OF CLAS
\ 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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -53,21 +53,6 @@
}
/**
- * Constructs a BoundSheetRecord and sets its fields appropriately
- *
- * @param in the RecordInputstream to read the record from
- */
- public BoundSheetRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void validateSid(short id) {
- if (id != sid) {
- throw new RecordFormatException("NOT A Bound Sheet RECORD");
- }
- }
-
- /**
* UTF8: sid + len + bof + flags + len(str) + unicode + str 2 + 2 + 4 + 2 +
* 1 + 1 + len(str)
*
@@ -75,7 +60,7 @@
* 1 + 1 + 2 * len(str)
*
*/
- protected void fillFields(RecordInputStream in) {
+ public BoundSheetRecord(RecordInputStream in) {
field_1_position_of_BOF = in.readInt();
field_2_option_flags = in.readUShort();
int field_3_sheetname_length = in.readUByte();
@@ -116,9 +101,8 @@
throw new IllegalArgumentException("sheetName must not be null");
}
int len = sheetName.length();
- if (len < 1 || len > 31) {
- throw new IllegalArgumentException("sheetName '" + sheetName
- + "' is invalid - must be 1-30 characters long");
+ if (len < 1) {
+ throw new IllegalArgumentException("sheetName must not be empty string");
}
for (int i=0; i<len; i++) {
char ch = sheetName.charAt(i);
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -49,11 +49,6 @@
public CFHeaderRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_numcf = in.readShort();
field_2_need_recalculation = in.readShort();
field_3_enclosing_cell_range = new org.apache.poi.hssf.util.CellRangeAddress(in);
@@ -160,22 +155,6 @@
return 4 + getDataSize();
}
- /**
- * called by constructor, should throw runtime exception in the event of a
- * record passed with a differing ID.
- *
- * @param id alleged id for this record
- */
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException(
- "NOT A ConditionalFormattingHeaderRecord RECORD");
- }
- }
-
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -159,10 +159,6 @@
}
public CFRuleRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in) {
field_1_condition_type = in.readByte();
field_2_comparison_operator = in.readByte();
int field_3_formula1_len = in.readUShort();
@@ -446,21 +442,6 @@
public void setParsedExpression2(Ptg[] ptgs) {
field_18_formula2 = safeClone(ptgs);
}
-
- /**
- * called by constructor, should throw runtime exception in the event of a
- * record passed with a differing ID.
- *
- * @param id alleged id for this record
- */
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A CFRULE RECORD");
- }
- }
public short getSid()
{
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -38,22 +38,12 @@
throw new RuntimeException("incomplete code");
}
- public CRNCountRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void validateSid(short id) {
- if (id != sid) {
- throw new RecordFormatException("NOT An XCT RECORD");
- }
- }
-
public int getNumberOfCRNs() {
return field_1_number_crn_records;
}
- protected void fillFields(RecordInputStream in) {
+ public CRNCountRecord(RecordInputStream in) {
field_1_number_crn_records = in.readShort();
if(field_1_number_crn_records < 0) {
// TODO - seems like the sign bit of this field might be used for some other purpose
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -39,22 +39,12 @@
throw new RuntimeException("incomplete code");
}
- public CRNRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void validateSid(short id) {
- if (id != sid) {
- throw new RecordFormatException("NOT An XCT RECORD");
- }
- }
-
public int getNumberOfCRNs() {
return field_1_last_column_index;
}
- protected void fillFields(RecordInputStream in) {
+ public CRNRecord(RecordInputStream in) {
field_1_last_column_index = in.readByte() & 0x00FF;
field_2_first_column_index = in.readByte() & 0x00FF;
field_3_row_index = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,27 +45,8 @@
{
}
- /**
- * Constructs a CalcCountRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- *
- */
-
public CalcCountRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT An Calc Count RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_iterations = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -61,26 +61,8 @@
{
}
- /**
- * Constructs a CalcModeRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CalcModeRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT An Calc Mode RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_calcmode = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -47,33 +47,8 @@
}
- /**
- * Constructs a CategorySeriesAxis record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public CategorySeriesAxisRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a CategorySeriesAxis record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_crossingPoint = in.readShort();
field_2_labelFrequency = in.readShort();
field_3_tickMarkFrequency = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -44,26 +44,8 @@
{
}
- /**
- * Constructs a ChartFormatRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public ChartFormatRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A CHARTFORMAT RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field1_x_position = in.readInt();
field2_y_position = in.readInt();
field3_width = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,33 +45,8 @@
}
- /**
- * Constructs a Chart record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public ChartRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a Chart record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_x = in.readInt();
field_2_y = in.readInt();
field_3_width = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -59,17 +59,6 @@
}
public ChartTitleFormatRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void validateSid(short id) {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A CHARTTITLEFORMAT RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in) {
m_recs = in.readUShort();
int idx;
CTFormat ctf;
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -47,26 +47,8 @@
{
}
- /**
- * Constructs a CodepageRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CodepageRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A CODEPAGE RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_codepage = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -52,18 +52,8 @@
field_6_reserved = 2; // seems to be the most common value
}
- /**
- * Constructs a ColumnInfo record and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public ColumnInfoRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_first_col = in.readUShort();
field_2_last_col = in.readUShort();
field_3_col_width = in.readUShort();
@@ -83,14 +73,6 @@
}
}
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A COLINFO RECORD!!");
- }
- }
-
/**
* set the first column this record defines formatting info for
* @param fc - the first column index (0-based)
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java?rev=700359&r1=700358&r2=700359&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java Mon Sep 29 23:42:27 2008
@@ -82,32 +82,8 @@
}
- /**
- * Constructs a CommonObjectData record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public CommonObjectDataSubRecord(RecordInputStream in)
{
- super(in);
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a CommonObjectData record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_objectType = in.readShort();
field_2_objectId = in.readShort();
field_3_option = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -46,17 +46,6 @@
}
/**
- * Main constructor -- kinda dummy because we don't validate or fill fields
- *
- * @param in the RecordInputstream to read the record from
- */
-
- public ContinueRecord(RecordInputStream in)
- {
- super(in);
- }
-
- /**
* USE ONLY within "processContinue"
*/
@@ -98,20 +87,6 @@
}
/**
- * Make sure we have a good id
- *
- * @param id the alleged id
- */
-
- protected void validateSid(short id)
- {
- if (id != ContinueRecord.sid)
- {
- throw new RecordFormatException("Not a Continue Record");
- }
- }
-
- /**
* Debugging toString
*
* @return string representation
@@ -139,7 +114,7 @@
* @param in the RecordInputstream to read the record from
*/
- protected void fillFields(RecordInputStream in)
+ public ContinueRecord(RecordInputStream in)
{
field_1_data = in.readRemainder();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -44,26 +44,8 @@
{
}
- /**
- * Constructs a CountryRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CountryRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A Country RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_default_country = in.readShort();
field_2_current_country = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -38,25 +38,8 @@
field_2_cell_offsets = new short[0];
}
- /**
- * Constructs a DBCellRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
public DBCellRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A valid DBCell RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_row_offset = in.readUShort();
int size = in.remaining();
field_2_cell_offsets = new short[ size / 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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -40,26 +40,8 @@
{
}
- /**
- * Constructs a DBCellRecord and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DSFRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A DSF RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_dsf = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -48,26 +48,7 @@
field_5_dv_no = 0x00000000;
}
- /**
- * Constructs a DVAL record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
- public DVALRecord(RecordInputStream in)
- {
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A valid DVAL RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
+ public DVALRecord(RecordInputStream in)
{
this.field_1_options = in.readShort();
this.field_2_horiz_pos = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -75,15 +75,6 @@
private static final BitField opt_show_error_on_invalid_value = new BitField(0x00080000);
private static final BitField opt_condition_operator = new BitField(0x00700000);
- /**
- * Constructs a DV record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
- public DVRecord(RecordInputStream in) {
- super(in);
- }
-
public DVRecord(int validationType, int operator, int errorStyle, boolean emptyCellAllowed,
boolean suppressDropDownArrow, boolean isExplicitList,
boolean showPromptBox, String promptTitle, String promptText,
@@ -110,13 +101,7 @@
_regions = regions;
}
- protected void validateSid(short id) {
- if (id != sid) {
- throw new RecordFormatException("NOT a valid DV RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in) {
+ public DVRecord(RecordInputStream in) {
_option_flags = in.readInt();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,33 +45,8 @@
}
- /**
- * Constructs a Dat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a Dat record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_options = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,33 +45,8 @@
}
- /**
- * Constructs a DataFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DataFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a DataFormat record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_pointNumber = in.readShort();
field_2_seriesIndex = in.readShort();
field_3_seriesNumber = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -40,26 +40,8 @@
{
}
- /**
- * Constructs a DateWindow1904 record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DateWindow1904Record(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A 1904 RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_window = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -36,26 +36,8 @@
{
}
- /**
- * Constructs a DefaultColumnWidth record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultColWidthRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A DefaultColWidth RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_col_width = in.readUShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,33 +45,8 @@
}
- /**
- * Constructs a DefaultDataLabelTextProperties record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultDataLabelTextPropertiesRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a DefaultDataLabelTextProperties record");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_categoryDataType = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -42,26 +42,8 @@
{
}
- /**
- * Constructs a DefaultRowHeight record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultRowHeightRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A DefaultRowHeight RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_option_flags = in.readShort();
field_2_row_height = in.readShort();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -44,26 +44,8 @@
{
}
- /**
- * Constructs a Delta record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DeltaRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A DELTA RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_max_change = in.readDouble();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -45,26 +45,8 @@
{
}
- /**
- * Constructs a Dimensions record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DimensionsRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT A valid DIMENSIONS RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_first_row = in.readInt();
field_2_last_row = in.readInt();
field_3_first_col = in.readShort();
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -31,24 +31,6 @@
public DrawingRecord( RecordInputStream in )
{
- super( in );
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a MSODRAWING record");
- }
- }
-
- protected void fillFields( RecordInputStream in )
- {
recordData = in.readRemainder();
}
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=700359&r1=700358&r2=700359&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 Mon Sep 29 23:42:27 2008
@@ -40,25 +40,10 @@
}
/**
- * Constructs a EOFRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
+ * @param in unused (since this record has no data)
*/
-
public EOFRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("NOT An EOF RECORD");
- }
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java?rev=700359&r1=700358&r2=700359&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java Mon Sep 29 23:42:27 2008
@@ -54,35 +54,12 @@
field_5_ole_classname = "";
}
- /**
- * Constructs an EmbeddedObjectRef record and sets its fields appropriately.
- *
- * @param in the record input stream.
- */
- public EmbeddedObjectRefSubRecord(RecordInputStream in)
- {
- super(in);
- }
-
- /**
- * Checks the sid matches the expected side for this record
- *
- * @param id the expected sid.
- */
- protected void validateSid(short id)
- {
- if (id != sid)
- {
- throw new RecordFormatException("Not a EmbeddedObjectRef record");
- }
- }
-
public short getSid()
{
return sid;
}
- protected void fillFields(RecordInputStream in)
+ public EmbeddedObjectRefSubRecord(RecordInputStream in)
{
field_1_stream_id_offset = in.readShort();
field_2_unknown = in.readShortArray();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org