ASF Bugzilla – Attachment 35089 Details for
Bug 61235
Remove org.apache.poi.hssf.record.RecordFormatException
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
patch.diff (text/plain), 29.79 KB, created by
PJ Fanning
on 2017-06-29 08:34:17 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
PJ Fanning
Created:
2017-06-29 08:34:17 UTC
Size:
29.79 KB
patch
obsolete
>Index: src/java/org/apache/poi/hssf/dev/BiffViewer.java >=================================================================== >--- src/java/org/apache/poi/hssf/dev/BiffViewer.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/dev/BiffViewer.java (working copy) >@@ -31,159 +31,9 @@ > import java.util.ArrayList; > import java.util.List; > >-import org.apache.poi.hssf.record.ArrayRecord; >-import org.apache.poi.hssf.record.AutoFilterInfoRecord; >-import org.apache.poi.hssf.record.BOFRecord; >-import org.apache.poi.hssf.record.BackupRecord; >-import org.apache.poi.hssf.record.BlankRecord; >-import org.apache.poi.hssf.record.BookBoolRecord; >-import org.apache.poi.hssf.record.BoolErrRecord; >-import org.apache.poi.hssf.record.BottomMarginRecord; >-import org.apache.poi.hssf.record.BoundSheetRecord; >-import org.apache.poi.hssf.record.CFHeader12Record; >-import org.apache.poi.hssf.record.CFHeaderRecord; >-import org.apache.poi.hssf.record.CFRule12Record; >-import org.apache.poi.hssf.record.CFRuleRecord; >-import org.apache.poi.hssf.record.CalcCountRecord; >-import org.apache.poi.hssf.record.CalcModeRecord; >-import org.apache.poi.hssf.record.CodepageRecord; >-import org.apache.poi.hssf.record.ColumnInfoRecord; >-import org.apache.poi.hssf.record.ContinueRecord; >-import org.apache.poi.hssf.record.CountryRecord; >-import org.apache.poi.hssf.record.DBCellRecord; >-import org.apache.poi.hssf.record.DConRefRecord; >-import org.apache.poi.hssf.record.DSFRecord; >-import org.apache.poi.hssf.record.DVALRecord; >-import org.apache.poi.hssf.record.DVRecord; >-import org.apache.poi.hssf.record.DateWindow1904Record; >-import org.apache.poi.hssf.record.DefaultColWidthRecord; >-import org.apache.poi.hssf.record.DefaultRowHeightRecord; >-import org.apache.poi.hssf.record.DeltaRecord; >-import org.apache.poi.hssf.record.DimensionsRecord; >-import org.apache.poi.hssf.record.DrawingGroupRecord; >-import org.apache.poi.hssf.record.DrawingRecordForBiffViewer; >-import org.apache.poi.hssf.record.DrawingSelectionRecord; >-import org.apache.poi.hssf.record.EOFRecord; >-import org.apache.poi.hssf.record.ExtSSTRecord; >-import org.apache.poi.hssf.record.ExtendedFormatRecord; >-import org.apache.poi.hssf.record.ExternSheetRecord; >-import org.apache.poi.hssf.record.ExternalNameRecord; >-import org.apache.poi.hssf.record.FeatHdrRecord; >-import org.apache.poi.hssf.record.FeatRecord; >-import org.apache.poi.hssf.record.FilePassRecord; >-import org.apache.poi.hssf.record.FileSharingRecord; >-import org.apache.poi.hssf.record.FnGroupCountRecord; >-import org.apache.poi.hssf.record.FontRecord; >-import org.apache.poi.hssf.record.FooterRecord; >-import org.apache.poi.hssf.record.FormatRecord; >-import org.apache.poi.hssf.record.FormulaRecord; >-import org.apache.poi.hssf.record.GridsetRecord; >-import org.apache.poi.hssf.record.GutsRecord; >-import org.apache.poi.hssf.record.HCenterRecord; >-import org.apache.poi.hssf.record.HeaderRecord; >-import org.apache.poi.hssf.record.HideObjRecord; >-import org.apache.poi.hssf.record.HorizontalPageBreakRecord; >-import org.apache.poi.hssf.record.HyperlinkRecord; >-import org.apache.poi.hssf.record.IndexRecord; >-import org.apache.poi.hssf.record.InterfaceEndRecord; >-import org.apache.poi.hssf.record.InterfaceHdrRecord; >-import org.apache.poi.hssf.record.IterationRecord; >-import org.apache.poi.hssf.record.LabelRecord; >-import org.apache.poi.hssf.record.LabelSSTRecord; >-import org.apache.poi.hssf.record.LeftMarginRecord; >-import org.apache.poi.hssf.record.MMSRecord; >-import org.apache.poi.hssf.record.MergeCellsRecord; >-import org.apache.poi.hssf.record.MulBlankRecord; >-import org.apache.poi.hssf.record.MulRKRecord; >-import org.apache.poi.hssf.record.NameCommentRecord; >-import org.apache.poi.hssf.record.NameRecord; >-import org.apache.poi.hssf.record.NoteRecord; >-import org.apache.poi.hssf.record.NumberRecord; >-import org.apache.poi.hssf.record.ObjRecord; >-import org.apache.poi.hssf.record.PaletteRecord; >-import org.apache.poi.hssf.record.PaneRecord; >-import org.apache.poi.hssf.record.PasswordRecord; >-import org.apache.poi.hssf.record.PasswordRev4Record; >-import org.apache.poi.hssf.record.PrecisionRecord; >-import org.apache.poi.hssf.record.PrintGridlinesRecord; >-import org.apache.poi.hssf.record.PrintHeadersRecord; >-import org.apache.poi.hssf.record.PrintSetupRecord; >-import org.apache.poi.hssf.record.ProtectRecord; >-import org.apache.poi.hssf.record.ProtectionRev4Record; >-import org.apache.poi.hssf.record.RKRecord; >-import org.apache.poi.hssf.record.RecalcIdRecord; >-import org.apache.poi.hssf.record.Record; >-import org.apache.poi.hssf.record.RecordInputStream; >+import org.apache.poi.hssf.record.*; > import org.apache.poi.hssf.record.RecordInputStream.LeftoverDataException; >-import org.apache.poi.hssf.record.RefModeRecord; >-import org.apache.poi.hssf.record.RefreshAllRecord; >-import org.apache.poi.hssf.record.RightMarginRecord; >-import org.apache.poi.hssf.record.RowRecord; >-import org.apache.poi.hssf.record.SCLRecord; >-import org.apache.poi.hssf.record.SSTRecord; >-import org.apache.poi.hssf.record.SaveRecalcRecord; >-import org.apache.poi.hssf.record.SelectionRecord; >-import org.apache.poi.hssf.record.SharedFormulaRecord; >-import org.apache.poi.hssf.record.StringRecord; >-import org.apache.poi.hssf.record.StyleRecord; >-import org.apache.poi.hssf.record.SupBookRecord; >-import org.apache.poi.hssf.record.TabIdRecord; >-import org.apache.poi.hssf.record.TableRecord; >-import org.apache.poi.hssf.record.TableStylesRecord; >-import org.apache.poi.hssf.record.TextObjectRecord; >-import org.apache.poi.hssf.record.TopMarginRecord; >-import org.apache.poi.hssf.record.UncalcedRecord; >-import org.apache.poi.hssf.record.UnknownRecord; >-import org.apache.poi.hssf.record.UseSelFSRecord; >-import org.apache.poi.hssf.record.VCenterRecord; >-import org.apache.poi.hssf.record.VerticalPageBreakRecord; >-import org.apache.poi.hssf.record.WSBoolRecord; >-import org.apache.poi.hssf.record.WindowOneRecord; >-import org.apache.poi.hssf.record.WindowProtectRecord; >-import org.apache.poi.hssf.record.WindowTwoRecord; >-import org.apache.poi.hssf.record.WriteAccessRecord; >-import org.apache.poi.hssf.record.WriteProtectRecord; >-import org.apache.poi.hssf.record.chart.AreaFormatRecord; >-import org.apache.poi.hssf.record.chart.AreaRecord; >-import org.apache.poi.hssf.record.chart.AxisLineFormatRecord; >-import org.apache.poi.hssf.record.chart.AxisOptionsRecord; >-import org.apache.poi.hssf.record.chart.AxisParentRecord; >-import org.apache.poi.hssf.record.chart.AxisRecord; >-import org.apache.poi.hssf.record.chart.AxisUsedRecord; >-import org.apache.poi.hssf.record.chart.BarRecord; >-import org.apache.poi.hssf.record.chart.BeginRecord; >-import org.apache.poi.hssf.record.chart.CatLabRecord; >-import org.apache.poi.hssf.record.chart.CategorySeriesAxisRecord; >-import org.apache.poi.hssf.record.chart.ChartEndBlockRecord; >-import org.apache.poi.hssf.record.chart.ChartEndObjectRecord; >-import org.apache.poi.hssf.record.chart.ChartFRTInfoRecord; >-import org.apache.poi.hssf.record.chart.ChartFormatRecord; >-import org.apache.poi.hssf.record.chart.ChartRecord; >-import org.apache.poi.hssf.record.chart.ChartStartBlockRecord; >-import org.apache.poi.hssf.record.chart.ChartStartObjectRecord; >-import org.apache.poi.hssf.record.chart.DatRecord; >-import org.apache.poi.hssf.record.chart.DataFormatRecord; >-import org.apache.poi.hssf.record.chart.DefaultDataLabelTextPropertiesRecord; >-import org.apache.poi.hssf.record.chart.EndRecord; >-import org.apache.poi.hssf.record.chart.FontBasisRecord; >-import org.apache.poi.hssf.record.chart.FontIndexRecord; >-import org.apache.poi.hssf.record.chart.FrameRecord; >-import org.apache.poi.hssf.record.chart.LegendRecord; >-import org.apache.poi.hssf.record.chart.LineFormatRecord; >-import org.apache.poi.hssf.record.chart.LinkedDataRecord; >-import org.apache.poi.hssf.record.chart.ObjectLinkRecord; >-import org.apache.poi.hssf.record.chart.PlotAreaRecord; >-import org.apache.poi.hssf.record.chart.PlotGrowthRecord; >-import org.apache.poi.hssf.record.chart.SeriesIndexRecord; >-import org.apache.poi.hssf.record.chart.SeriesListRecord; >-import org.apache.poi.hssf.record.chart.SeriesRecord; >-import org.apache.poi.hssf.record.chart.SeriesTextRecord; >-import org.apache.poi.hssf.record.chart.SeriesToChartGroupRecord; >-import org.apache.poi.hssf.record.chart.SheetPropertiesRecord; >-import org.apache.poi.hssf.record.chart.TextRecord; >-import org.apache.poi.hssf.record.chart.TickRecord; >-import org.apache.poi.hssf.record.chart.UnitsRecord; >-import org.apache.poi.hssf.record.chart.ValueRangeRecord; >+import org.apache.poi.hssf.record.chart.*; > import org.apache.poi.hssf.record.pivottable.DataItemRecord; > import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord; > import org.apache.poi.hssf.record.pivottable.PageItemRecord; >Index: src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java >=================================================================== >--- src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java (working copy) >@@ -20,7 +20,11 @@ > import java.io.InputStream; > import java.util.Arrays; > >-import org.apache.poi.hssf.record.*; >+import org.apache.poi.hssf.record.ContinueRecord; >+import org.apache.poi.hssf.record.Record; >+import org.apache.poi.hssf.record.RecordFactory; >+import org.apache.poi.hssf.record.RecordInputStream; >+import org.apache.poi.util.RecordFormatException; > > /** > * Event-based record factory. As opposed to RecordFactory >Index: src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java >=================================================================== >--- src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java (working copy) >@@ -18,7 +18,7 @@ > package org.apache.poi.hssf.eventusermodel.dummyrecord; > > import org.apache.poi.hssf.record.Record; >-import org.apache.poi.hssf.record.RecordFormatException; >+import org.apache.poi.util.RecordFormatException; > > /** > */ >Index: src/java/org/apache/poi/hssf/model/InternalSheet.java >=================================================================== >--- src/java/org/apache/poi/hssf/model/InternalSheet.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/model/InternalSheet.java (working copy) >@@ -21,43 +21,7 @@ > import java.util.Iterator; > import java.util.List; > >-import org.apache.poi.hssf.record.BOFRecord; >-import org.apache.poi.hssf.record.CFHeader12Record; >-import org.apache.poi.hssf.record.CFHeaderRecord; >-import org.apache.poi.hssf.record.CalcCountRecord; >-import org.apache.poi.hssf.record.CalcModeRecord; >-import org.apache.poi.hssf.record.CellValueRecordInterface; >-import org.apache.poi.hssf.record.ColumnInfoRecord; >-import org.apache.poi.hssf.record.DVALRecord; >-import org.apache.poi.hssf.record.DefaultColWidthRecord; >-import org.apache.poi.hssf.record.DefaultRowHeightRecord; >-import org.apache.poi.hssf.record.DeltaRecord; >-import org.apache.poi.hssf.record.DimensionsRecord; >-import org.apache.poi.hssf.record.DrawingRecord; >-import org.apache.poi.hssf.record.EOFRecord; >-import org.apache.poi.hssf.record.EscherAggregate; >-import org.apache.poi.hssf.record.FeatHdrRecord; >-import org.apache.poi.hssf.record.FeatRecord; >-import org.apache.poi.hssf.record.GridsetRecord; >-import org.apache.poi.hssf.record.GutsRecord; >-import org.apache.poi.hssf.record.IndexRecord; >-import org.apache.poi.hssf.record.IterationRecord; >-import org.apache.poi.hssf.record.MergeCellsRecord; >-import org.apache.poi.hssf.record.NoteRecord; >-import org.apache.poi.hssf.record.PaneRecord; >-import org.apache.poi.hssf.record.PrintGridlinesRecord; >-import org.apache.poi.hssf.record.PrintHeadersRecord; >-import org.apache.poi.hssf.record.Record; >-import org.apache.poi.hssf.record.RecordBase; >-import org.apache.poi.hssf.record.RecordFormatException; >-import org.apache.poi.hssf.record.RefModeRecord; >-import org.apache.poi.hssf.record.RowRecord; >-import org.apache.poi.hssf.record.SCLRecord; >-import org.apache.poi.hssf.record.SaveRecalcRecord; >-import org.apache.poi.hssf.record.SelectionRecord; >-import org.apache.poi.hssf.record.UncalcedRecord; >-import org.apache.poi.hssf.record.WSBoolRecord; >-import org.apache.poi.hssf.record.WindowTwoRecord; >+import org.apache.poi.hssf.record.*; > import org.apache.poi.hssf.record.aggregates.ChartSubstreamRecordAggregate; > import org.apache.poi.hssf.record.aggregates.ColumnInfoRecordsAggregate; > import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable; >@@ -76,6 +40,7 @@ > import org.apache.poi.util.Internal; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > > /** > * Low level model implementation of a Sheet (one workbook contains many sheets) >Index: src/java/org/apache/poi/hssf/record/BoolErrRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/BoolErrRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/BoolErrRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.ss.usermodel.FormulaError; > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * Creates new BoolErrRecord. (0x0205) <P> >Index: src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (working copy) >@@ -22,6 +22,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * The common object data record is used to store all common preferences for an excel object. >Index: src/java/org/apache/poi/hssf/record/DConRefRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/DConRefRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/DConRefRecord.java (working copy) >@@ -22,6 +22,7 @@ > > import org.apache.poi.util.LittleEndian; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >@@ -129,8 +130,7 @@ > charCount = LittleEndian.getUShort(data, offset); > offset += LittleEndian.SHORT_SIZE; > if (charCount < 2) >- throw new org.apache.poi.hssf.record.RecordFormatException( >- "Character count must be >= 2"); >+ throw new RecordFormatException("Character count must be >= 2"); > > charType = LittleEndian.getUByte(data, offset); > offset += LittleEndian.BYTE_SIZE; //7 bits reserved + 1 bit type >Index: src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (working copy) >@@ -31,6 +31,7 @@ > import org.apache.poi.util.LittleEndianOutput; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/EndSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/EndSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/EndSubRecord.java (working copy) >@@ -19,6 +19,7 @@ > > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * ftEnd (0x0000)<p> >Index: src/java/org/apache/poi/hssf/record/EscherAggregate.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/EscherAggregate.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/EscherAggregate.java (working copy) >@@ -38,6 +38,7 @@ > import org.apache.poi.ddf.EscherTextboxRecord; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > > /** > * This class is used to aggregate the MSODRAWING and OBJ record >Index: src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > > /** >Index: src/java/org/apache/poi/hssf/record/FtCfSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/FtCfSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/FtCfSubRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > > /** >Index: src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > > /** >Index: src/java/org/apache/poi/hssf/record/HyperlinkRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/HyperlinkRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/HyperlinkRecord.java (working copy) >@@ -25,6 +25,7 @@ > import org.apache.poi.util.LittleEndianOutput; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/IndexRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/IndexRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/IndexRecord.java (working copy) >@@ -19,6 +19,7 @@ > > import org.apache.poi.util.IntList; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * Title: Index Record (0x020B)<p> >Index: src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java (working copy) >@@ -18,6 +18,7 @@ > package org.apache.poi.hssf.record; > > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * Title: Interface End Record (0x00E2)<P> >Index: src/java/org/apache/poi/hssf/record/LabelRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/LabelRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/LabelRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > > /** > * Label Record (0x0204) - read only support for strings stored directly in the cell... >Index: src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/MulRKRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/MulRKRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/MulRKRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.hssf.util.RKUtil; > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * MULRK (0x00BD)<p> >Index: src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * ftNts (0x000D)<p> >Index: src/java/org/apache/poi/hssf/record/ObjRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/ObjRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/ObjRecord.java (working copy) >@@ -25,6 +25,7 @@ > import org.apache.poi.util.LittleEndian; > import org.apache.poi.util.LittleEndianByteArrayOutputStream; > import org.apache.poi.util.LittleEndianInputStream; >+import org.apache.poi.util.RecordFormatException; > > /** > * OBJRECORD (0x005D)<p> >Index: src/java/org/apache/poi/hssf/record/OldLabelRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/OldLabelRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/OldLabelRecord.java (working copy) >@@ -20,6 +20,7 @@ > import org.apache.poi.util.HexDump; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >+import org.apache.poi.util.RecordFormatException; > > /** > * Biff2 - Biff 4 Label Record (0x0004 / 0x0204) - read only support for >Index: src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java (working copy) >@@ -27,6 +27,7 @@ > import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; > import org.apache.poi.poifs.crypt.Decryptor; > import org.apache.poi.poifs.crypt.EncryptionInfo; >+import org.apache.poi.util.RecordFormatException; > > /** > * A stream based way to get at complete records, with >Index: src/java/org/apache/poi/hssf/record/RecordInputStream.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/RecordInputStream.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/RecordInputStream.java (working copy) >@@ -29,6 +29,7 @@ > import org.apache.poi.util.LittleEndianConsts; > import org.apache.poi.util.LittleEndianInput; > import org.apache.poi.util.LittleEndianInputStream; >+import org.apache.poi.util.RecordFormatException; > > /** > * Title: Record Input Stream<P> >Index: src/java/org/apache/poi/hssf/record/StyleRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/StyleRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/StyleRecord.java (working copy) >@@ -21,6 +21,7 @@ > import org.apache.poi.util.BitFieldFactory; > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/TextObjectRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/TextObjectRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/TextObjectRecord.java (working copy) >@@ -19,12 +19,13 @@ > > import org.apache.poi.hssf.record.cont.ContinuableRecord; > import org.apache.poi.hssf.record.cont.ContinuableRecordOutput; >+import org.apache.poi.hssf.usermodel.HSSFRichTextString; > import org.apache.poi.ss.formula.ptg.OperandPtg; > import org.apache.poi.ss.formula.ptg.Ptg; >-import org.apache.poi.hssf.usermodel.HSSFRichTextString; > import org.apache.poi.util.BitField; > import org.apache.poi.util.BitFieldFactory; > import org.apache.poi.util.HexDump; >+import org.apache.poi.util.RecordFormatException; > > /** > * The TXO record (0x01B6) is used to define the properties of a text box. It is >Index: src/java/org/apache/poi/hssf/record/WriteAccessRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/WriteAccessRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/WriteAccessRecord.java (working copy) >@@ -21,6 +21,7 @@ > > import org.apache.poi.util.LittleEndian; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java (working copy) >@@ -21,16 +21,16 @@ > import org.apache.poi.hssf.record.CellValueRecordInterface; > import org.apache.poi.hssf.record.FormulaRecord; > import org.apache.poi.hssf.record.Record; >-import org.apache.poi.hssf.record.RecordFormatException; > import org.apache.poi.hssf.record.SharedFormulaRecord; > import org.apache.poi.hssf.record.StringRecord; > import org.apache.poi.hssf.util.CellRangeAddress8Bit; >+import org.apache.poi.ss.formula.Formula; > import org.apache.poi.ss.formula.ptg.ExpPtg; > import org.apache.poi.ss.formula.ptg.Ptg; >-import org.apache.poi.ss.formula.Formula; > import org.apache.poi.ss.usermodel.FormulaError; > import org.apache.poi.ss.util.CellRangeAddress; > import org.apache.poi.ss.util.CellReference; >+import org.apache.poi.util.RecordFormatException; > > /** > * The formula record aggregate is used to join together the formula record and it's >Index: src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java (working copy) >@@ -22,9 +22,9 @@ > import org.apache.poi.hssf.record.PasswordRecord; > import org.apache.poi.hssf.record.ProtectRecord; > import org.apache.poi.hssf.record.Record; >-import org.apache.poi.hssf.record.RecordFormatException; > import org.apache.poi.hssf.record.ScenarioProtectRecord; > import org.apache.poi.poifs.crypt.CryptoFunctions; >+import org.apache.poi.util.RecordFormatException; > > /** > * Groups the sheet protection records for a worksheet. >Index: src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java (working copy) >@@ -24,7 +24,6 @@ > import org.apache.poi.hssf.record.BiffHeaderInput; > import org.apache.poi.hssf.record.FilePassRecord; > import org.apache.poi.hssf.record.InterfaceHdrRecord; >-import org.apache.poi.hssf.record.RecordFormatException; > import org.apache.poi.poifs.crypt.ChunkedCipherInputStream; > import org.apache.poi.poifs.crypt.Decryptor; > import org.apache.poi.poifs.crypt.EncryptionInfo; >@@ -31,6 +30,7 @@ > import org.apache.poi.util.LittleEndian; > import org.apache.poi.util.LittleEndianConsts; > import org.apache.poi.util.LittleEndianInput; >+import org.apache.poi.util.RecordFormatException; > > public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndianInput { > >Index: src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java (working copy) >@@ -17,11 +17,11 @@ > > package org.apache.poi.hssf.record.pivottable; > >-import org.apache.poi.hssf.record.RecordFormatException; > import org.apache.poi.hssf.record.RecordInputStream; > import org.apache.poi.hssf.record.StandardRecord; > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > import org.apache.poi.util.StringUtil; > > /** >Index: src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java >=================================================================== >--- src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java (revision 1800245) >+++ src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java (working copy) >@@ -17,11 +17,11 @@ > > package org.apache.poi.hssf.record.pivottable; > >-import org.apache.poi.hssf.record.RecordFormatException; > import org.apache.poi.hssf.record.RecordInputStream; > import org.apache.poi.hssf.record.StandardRecord; > import org.apache.poi.util.HexDump; > import org.apache.poi.util.LittleEndianOutput; >+import org.apache.poi.util.RecordFormatException; > > /** > * SXPI - Page Item (0x00B6)<br/>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 61235
: 35089