You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by jh...@apache.org on 2006/01/03 08:28:43 UTC
svn commit: r365561 [1/2] - in
/jakarta/poi/trunk/src/java/org/apache/poi/hssf: dev/ eventmodel/
eventusermodel/ model/ record/ record/aggregates/ record/formula/ usermodel/
Author: jheight
Date: Mon Jan 2 23:24:01 2006
New Revision: 365561
URL: http://svn.apache.org/viewcvs?rev=365561&view=rev
Log:
Added patch (along with fixes to it so that the unit tests work) for bug 37637
Bug 37622 and 30319 should be fixed. Tested that Euro DataFormat now works.
Ill provide a euro symbol/unicode unit test shortly.
Numerous minor changes so eclipse doesnt give so many warnings (incomplete)
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/HSSF.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/PolygonShape.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Sheet.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordProcessor.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SSTSerializer.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Mon Jan 2 23:24:01 2006
@@ -24,7 +24,6 @@
import org.apache.poi.hssf.record.*;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
import java.io.FileInputStream;
import java.io.IOException;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java Mon Jan 2 23:24:01 2006
@@ -21,8 +21,6 @@
import java.io.IOException;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.hssf.eventmodel.*;
-import org.apache.poi.hssf.eventusermodel.*;
import org.apache.poi.hssf.record.Record;
import org.apache.poi.hssf.eventusermodel.HSSFRequest;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java Mon Jan 2 23:24:01 2006
@@ -23,22 +23,15 @@
*/
package org.apache.poi.hssf.dev;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
//import java.io.*;
import java.util.List;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.formula.*;
import org.apache.poi.hssf.model.*;
-import org.apache.poi.hssf.usermodel.*;
/**
* FormulaViewer - finds formulas in a BIFF8 file and attempts to read them/display
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/HSSF.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/HSSF.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/HSSF.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/HSSF.java Mon Jan 2 23:24:01 2006
@@ -17,13 +17,11 @@
package org.apache.poi.hssf.dev;
-import java.io.InputStream;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.*;
@@ -41,9 +39,6 @@
{
private String filename = null;
- // private POIFSFileSystem fs = null;
- private InputStream stream = null;
- private Record[] records = null;
protected HSSFWorkbook hssfworkbook = null;
/**
@@ -98,13 +93,13 @@
f.setFontHeightInPoints(( short ) 12);
f.setColor(( short ) 0xA);
- f.setBoldweight(f.BOLDWEIGHT_BOLD);
+ f.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
f2.setFontHeightInPoints(( short ) 10);
f2.setColor(( short ) 0xf);
- f2.setBoldweight(f2.BOLDWEIGHT_BOLD);
+ f2.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
cs.setFont(f);
cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
- cs2.setBorderBottom(cs2.BORDER_THIN);
+ cs2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
cs2.setFillPattern(( short ) 1); // fill w fg
cs2.setFillForegroundColor(( short ) 0xA);
cs2.setFont(f2);
@@ -144,7 +139,7 @@
rownum++;
rownum++;
r = s.createRow(rownum);
- cs3.setBorderBottom(cs3.BORDER_THICK);
+ cs3.setBorderBottom(HSSFCellStyle.BORDER_THICK);
for (short cellnum = ( short ) 0; cellnum < 50; cellnum++)
{
c = r.createCell(cellnum, HSSFCell.CELL_TYPE_BLANK);
@@ -183,7 +178,7 @@
public HSSF(String infile, String outfile, boolean write)
throws IOException
{
- this.filename = filename;
+ this.filename = infile;
POIFSFileSystem fs =
new POIFSFileSystem(new FileInputStream(filename));
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java Mon Jan 2 23:24:01 2006
@@ -16,7 +16,6 @@
package org.apache.poi.hssf.eventmodel;
-import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -104,7 +103,6 @@
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.util.LittleEndian;
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java Mon Jan 2 23:24:01 2006
@@ -20,7 +20,6 @@
import java.io.InputStream;
import java.io.IOException;
-import org.apache.poi.util.LittleEndian;
import org.apache.poi.hssf.eventusermodel.HSSFUserException;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.Record;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java Mon Jan 2 23:24:01 2006
@@ -63,16 +63,11 @@
* Using an unsynchronized linkedlist to implement a stack since we're not multi-threaded.
*/
private List functionTokens = new LinkedList();
-
- //private Stack tokens = new java.util.Stack();
- private List result = new ArrayList();
- private int numParen;
-
+
private static char TAB = '\t';
private static char CR = '\n';
private char look; // Lookahead Character
- private boolean inFunction = false;
private Workbook book;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/PolygonShape.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/PolygonShape.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/PolygonShape.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/PolygonShape.java Mon Jan 2 23:24:01 2006
@@ -22,7 +22,6 @@
import org.apache.poi.hssf.record.EscherAggregate;
import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
import org.apache.poi.hssf.record.EndSubRecord;
-import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
import org.apache.poi.hssf.usermodel.HSSFShape;
import org.apache.poi.hssf.usermodel.HSSFPolygon;
import org.apache.poi.util.LittleEndian;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Sheet.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Sheet.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Sheet.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Sheet.java Mon Jan 2 23:24:01 2006
@@ -936,10 +936,13 @@
public void addValueRecord(int row, CellValueRecordInterface col)
{
checkCells();
- log.logFormatted(POILogger.DEBUG, "add value record row,loc %,%", new int[]
+ if(log.check(POILogger.DEBUG))
{
- row, loc
- });
+ log.logFormatted(POILogger.DEBUG, "add value record row,loc %,%", new int[]
+ {
+ row, loc
+ });
+ }
DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
if (col.getColumn() > d.getLastCol())
@@ -1764,9 +1767,10 @@
if (columns != null)
{
- for ( Iterator iterator = columns.getIterator(); iterator.hasNext(); )
+ int count=columns.getNumColumns();
+ for ( int k=0;k<count;k++ )
{
- ci = ( ColumnInfoRecord ) iterator.next();
+ ci = columns.getColInfo(k);
if ((ci.getFirstColumn() <= column)
&& (column <= ci.getLastColumn()))
{
@@ -1804,8 +1808,10 @@
short retval = 0;
ColumnInfoRecord ci = null;
if (columns != null) {
- for (Iterator iterator = columns.getIterator(); iterator.hasNext();) {
- ci = (ColumnInfoRecord) iterator.next();
+ int count=columns.getNumColumns();
+ for ( int k=0;k<count;k++ )
+ {
+ ci = columns.getColInfo(k);
if ((ci.getFirstColumn() <= column)
&& (column <= ci.getLastColumn())) {
break;
@@ -1850,9 +1856,10 @@
// Determine the maximum overall level
int maxLevel = 0;
- for ( Iterator iterator = columns.getIterator(); iterator.hasNext(); )
+ int count=columns.getNumColumns();
+ for ( int k=0;k<count;k++ )
{
- ColumnInfoRecord columnInfoRecord = (ColumnInfoRecord) iterator.next();
+ ColumnInfoRecord columnInfoRecord = columns.getColInfo(k);
maxLevel = Math.max(columnInfoRecord.getOutlineLevel(), maxLevel);
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java Mon Jan 2 23:24:01 2006
@@ -23,7 +23,6 @@
import org.apache.poi.hssf.util.SheetReferences;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
import java.util.ArrayList;
import java.util.Iterator;
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java Mon Jan 2 23:24:01 2006
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.poi.hssf.record.NameRecord;
import org.apache.poi.hssf.record.Record;
public class WorkbookRecordList
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -78,8 +78,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_foregroundColor = in.readInt();
field_2_backgroundColor = in.readInt();
field_3_pattern = in.readShort();
@@ -152,7 +150,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java Mon Jan 2 23:24:01 2006
@@ -75,9 +75,7 @@
protected void fillFields(RecordInputStream in)
{
- int pos = 0;
field_1_formatFlags = in.readShort();
-
}
public String toString()
@@ -119,7 +117,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -75,10 +75,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_axisType = in.readShort();
-
}
public String toString()
@@ -117,7 +114,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java Mon Jan 2 23:24:01 2006
@@ -87,8 +87,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_minimumCategory = in.readShort();
field_2_maximumCategory = in.readShort();
field_3_majorUnitValue = in.readShort();
@@ -98,7 +96,6 @@
field_7_baseUnit = in.readShort();
field_8_crossingPoint = in.readShort();
field_9_options = in.readShort();
-
}
public String toString()
@@ -185,7 +182,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java Mon Jan 2 23:24:01 2006
@@ -77,14 +77,11 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_axisType = in.readShort();
field_2_x = in.readInt();
field_3_y = in.readInt();
field_4_width = in.readInt();
field_5_height = in.readInt();
-
}
public String toString()
@@ -143,7 +140,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java Mon Jan 2 23:24:01 2006
@@ -78,14 +78,11 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_axisType = in.readShort();
field_2_reserved1 = in.readInt();
field_3_reserved2 = in.readInt();
field_4_reserved3 = in.readInt();
field_5_reserved4 = in.readInt();
-
}
public String toString()
@@ -144,7 +141,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java Mon Jan 2 23:24:01 2006
@@ -71,10 +71,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_numAxis = in.readShort();
-
}
public String toString()
@@ -113,7 +110,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java Mon Jan 2 23:24:01 2006
@@ -304,7 +304,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java Mon Jan 2 23:24:01 2006
@@ -114,6 +114,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java Mon Jan 2 23:24:01 2006
@@ -77,12 +77,9 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_barSpace = in.readShort();
field_2_categorySpace = in.readShort();
field_3_formatFlags = in.readShort();
-
}
public String toString()
@@ -135,7 +132,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java Mon Jan 2 23:24:01 2006
@@ -87,6 +87,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java Mon Jan 2 23:24:01 2006
@@ -214,7 +214,7 @@
public short getSid()
{
- return BlankRecord.sid;
+ return sid;
}
public String toString()
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java Mon Jan 2 23:24:01 2006
@@ -114,6 +114,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java Mon Jan 2 23:24:01 2006
@@ -268,7 +268,7 @@
protected void validateSid(short id)
{
- if (id != this.sid)
+ if (id != BoolErrRecord.sid)
{
throw new RecordFormatException("Not a valid BoolErrRecord");
}
@@ -276,7 +276,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public boolean isBefore(CellValueRecordInterface i)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java Mon Jan 2 23:24:01 2006
@@ -97,7 +97,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java Mon Jan 2 23:24:01 2006
@@ -144,11 +144,7 @@
/**
* Set the sheetname for this sheet. (this appears in the tabs at the bottom)
* @param sheetname the name of the sheet
-<<<<<<< BoundSheetRecord.java
- * @thows IllegalArgumentException if sheet name will cause excel to crash.
-=======
* @throws IllegalArgumentException if sheet name will cause excel to crash.
->>>>>>> 1.14
*/
public void setSheetname( String sheetname )
@@ -165,6 +161,7 @@
throw new IllegalArgumentException("Sheet name cannot be blank, greater than 31 chars, or contain any of /\\*?[]");
}
field_5_sheetname = sheetname;
+ setCompressedUnicodeFlag(StringUtil.hasMultibyte(sheetname) ? (byte)1 : (byte)0);
}
/**
@@ -303,6 +300,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java Mon Jan 2 23:24:01 2006
@@ -117,7 +117,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java Mon Jan 2 23:24:01 2006
@@ -142,7 +142,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java Mon Jan 2 23:24:01 2006
@@ -77,13 +77,10 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_crossingPoint = in.readShort();
field_2_labelFrequency = in.readShort();
field_3_tickMarkFrequency = in.readShort();
field_4_options = in.readShort();
-
}
public String toString()
@@ -140,7 +137,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -116,7 +116,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public int getXPosition()
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java Mon Jan 2 23:24:01 2006
@@ -74,13 +74,10 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_x = in.readInt();
field_2_y = in.readInt();
field_3_width = in.readInt();
field_4_height = in.readInt();
-
}
public String toString()
@@ -134,7 +131,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java Mon Jan 2 23:24:01 2006
@@ -123,6 +123,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java Mon Jan 2 23:24:01 2006
@@ -110,15 +110,12 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_objectType = in.readShort();
field_2_objectId = in.readShort();
field_3_option = in.readShort();
field_4_reserved1 = in.readInt();
field_5_reserved2 = in.readInt();
field_6_reserved3 = in.readInt();
-
}
public String toString()
@@ -186,7 +183,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java Mon Jan 2 23:24:01 2006
@@ -18,8 +18,6 @@
package org.apache.poi.hssf.record;
-import java.util.ArrayList;
-
import org.apache.poi.util.LittleEndian;
/**
@@ -134,7 +132,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java Mon Jan 2 23:24:01 2006
@@ -144,6 +144,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java Mon Jan 2 23:24:01 2006
@@ -184,7 +184,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public boolean isInValueSection()
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java Mon Jan 2 23:24:01 2006
@@ -112,6 +112,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java Mon Jan 2 23:24:01 2006
@@ -75,10 +75,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_options = in.readShort();
-
}
public String toString()
@@ -121,7 +118,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -75,13 +75,10 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_pointNumber = in.readShort();
field_2_seriesIndex = in.readShort();
field_3_seriesNumber = in.readShort();
field_4_formatFlags = in.readShort();
-
}
public String toString()
@@ -136,7 +133,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java Mon Jan 2 23:24:01 2006
@@ -112,6 +112,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java Mon Jan 2 23:24:01 2006
@@ -112,7 +112,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java Mon Jan 2 23:24:01 2006
@@ -74,10 +74,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_categoryDataType = in.readShort();
-
}
public String toString()
@@ -116,7 +113,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java Mon Jan 2 23:24:01 2006
@@ -137,7 +137,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java Mon Jan 2 23:24:01 2006
@@ -115,7 +115,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java Mon Jan 2 23:24:01 2006
@@ -192,7 +192,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java Mon Jan 2 23:24:01 2006
@@ -89,7 +89,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java Mon Jan 2 23:24:01 2006
@@ -88,6 +88,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java Mon Jan 2 23:24:01 2006
@@ -70,9 +70,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
-
}
public String toString()
@@ -87,8 +84,6 @@
public int serialize(int offset, byte[] data)
{
- int pos = 0;
-
LittleEndian.putShort(data, 0 + offset, sid);
LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
@@ -106,7 +101,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -1814,6 +1814,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java Mon Jan 2 23:24:01 2006
@@ -174,6 +174,6 @@
* return the non static version of the id for this record.
*/
public short getSid() {
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java Mon Jan 2 23:24:01 2006
@@ -155,6 +155,6 @@
* return the non static version of the id for this record.
*/
public short getSid() {
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java Mon Jan 2 23:24:01 2006
@@ -120,6 +120,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java Mon Jan 2 23:24:01 2006
@@ -75,14 +75,11 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_xBasis = in.readShort();
field_2_yBasis = in.readShort();
field_3_heightBasis = in.readShort();
field_4_scale = in.readShort();
field_5_indexToFontTable = in.readShort();
-
}
public String toString()
@@ -141,7 +138,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java Mon Jan 2 23:24:01 2006
@@ -71,10 +71,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_fontIndex = in.readShort();
-
}
public String toString()
@@ -113,7 +110,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java Mon Jan 2 23:24:01 2006
@@ -538,6 +538,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java Mon Jan 2 23:24:01 2006
@@ -202,7 +202,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java Mon Jan 2 23:24:01 2006
@@ -127,7 +127,7 @@
public void setFormatString(String fs)
{
field_4_formatstring = fs;
- setUnicodeFlag(StringUtil.isUnicodeString(fs));
+ setUnicodeFlag(StringUtil.hasMultibyte(fs));
}
/**
@@ -227,6 +227,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java Mon Jan 2 23:24:01 2006
@@ -76,11 +76,8 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_borderType = in.readShort();
field_2_options = in.readShort();
-
}
public String toString()
@@ -126,7 +123,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java Mon Jan 2 23:24:01 2006
@@ -124,7 +124,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java Mon Jan 2 23:24:01 2006
@@ -194,7 +194,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java Mon Jan 2 23:24:01 2006
@@ -118,7 +118,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java Mon Jan 2 23:24:01 2006
@@ -202,7 +202,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java Mon Jan 2 23:24:01 2006
@@ -122,6 +122,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java Mon Jan 2 23:24:01 2006
@@ -180,7 +180,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java Mon Jan 2 23:24:01 2006
@@ -87,6 +87,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java Mon Jan 2 23:24:01 2006
@@ -121,6 +121,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java Mon Jan 2 23:24:01 2006
@@ -122,7 +122,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java Mon Jan 2 23:24:01 2006
@@ -23,9 +23,6 @@
*/
package org.apache.poi.hssf.record;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
/**
* Label Record - read only support for strings stored directly in the cell.. Don't
* use this (except to read), use LabelSST instead <P>
@@ -77,7 +74,7 @@
protected void validateSid(short id)
{
- if (id != this.sid)
+ if (id != sid)
{
throw new RecordFormatException("Not a valid LabelRecord");
}
@@ -181,7 +178,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public String toString()
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java Mon Jan 2 23:24:01 2006
@@ -182,7 +182,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public boolean isBefore(CellValueRecordInterface i)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java Mon Jan 2 23:24:01 2006
@@ -84,7 +84,7 @@
}
public short getSid() {
- return this.sid;
+ return sid;
}
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java Mon Jan 2 23:24:01 2006
@@ -92,8 +92,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_xAxisUpperLeft = in.readInt();
field_2_yAxisUpperLeft = in.readInt();
field_3_xSize = in.readInt();
@@ -101,7 +99,6 @@
field_5_type = in.readByte();
field_6_spacing = in.readByte();
field_7_options = in.readShort();
-
}
public String toString()
@@ -176,7 +173,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java Mon Jan 2 23:24:01 2006
@@ -91,8 +91,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_lineColor = in.readInt();
field_2_linePattern = in.readShort();
field_3_weight = in.readShort();
@@ -160,7 +158,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java Mon Jan 2 23:24:01 2006
@@ -148,7 +148,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java Mon Jan 2 23:24:01 2006
@@ -137,6 +137,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java Mon Jan 2 23:24:01 2006
@@ -23,8 +23,6 @@
*/
package org.apache.poi.hssf.record;
-import org.apache.poi.util.LittleEndian;
-
/**
* Title: Mulitple Blank cell record <P>
* Description: Represents a set of columns in a row with no value but with styling.
@@ -34,7 +32,6 @@
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Glen Stampoultzis (glens at apache.org)
* @version 2.0-pre
- * @see org.apache.poi.hssf.record.RecordFactory
* @see org.apache.poi.hssf.record.BlankRecord
*/
@@ -185,7 +182,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public int serialize(int offset, byte [] data)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java Mon Jan 2 23:24:01 2006
@@ -25,7 +25,6 @@
import java.util.ArrayList;
-import org.apache.poi.util.LittleEndian;
import org.apache.poi.hssf.util.RKUtil;
/**
@@ -188,7 +187,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public int serialize(int offset, byte [] data)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java Mon Jan 2 23:24:01 2006
@@ -767,7 +767,7 @@
* return the non static version of the id for this record.
*/
public short getSid() {
- return this.sid;
+ return sid;
}
/*
20 00
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java Mon Jan 2 23:24:01 2006
@@ -71,10 +71,7 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_formatIndex = in.readShort();
-
}
public String toString()
@@ -113,7 +110,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java Mon Jan 2 23:24:01 2006
@@ -205,7 +205,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public boolean isBefore(CellValueRecordInterface i)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java Mon Jan 2 23:24:01 2006
@@ -78,8 +78,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_anchorId = in.readShort();
field_2_link1 = in.readShort();
field_3_link2 = in.readShort();
@@ -132,7 +130,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java Mon Jan 2 23:24:01 2006
@@ -123,7 +123,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java Mon Jan 2 23:24:01 2006
@@ -79,8 +79,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_x = in.readShort();
field_2_y = in.readShort();
field_3_topRow = in.readShort();
@@ -145,7 +143,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java Mon Jan 2 23:24:01 2006
@@ -113,7 +113,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
/**
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java Mon Jan 2 23:24:01 2006
@@ -114,6 +114,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java Mon Jan 2 23:24:01 2006
@@ -71,8 +71,6 @@
protected void fillFields(RecordInputStream in)
{
- int pos = 0;
-
}
public String toString()
@@ -87,8 +85,6 @@
public int serialize(int offset, byte[] data)
{
- int pos = 0;
-
LittleEndian.putShort(data, 0 + offset, sid);
LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
@@ -106,7 +102,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java Mon Jan 2 23:24:01 2006
@@ -72,8 +72,6 @@
protected void fillFields(RecordInputStream in)
{
-
- int pos = 0;
field_1_horizontalScale = in.readInt();
field_2_verticalScale = in.readInt();
@@ -120,7 +118,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java Mon Jan 2 23:24:01 2006
@@ -121,6 +121,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java Mon Jan 2 23:24:01 2006
@@ -120,7 +120,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java Mon Jan 2 23:24:01 2006
@@ -119,7 +119,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java Mon Jan 2 23:24:01 2006
@@ -373,7 +373,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java Mon Jan 2 23:24:01 2006
@@ -120,7 +120,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public Object clone() {
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java Mon Jan 2 23:24:01 2006
@@ -119,6 +119,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java Mon Jan 2 23:24:01 2006
@@ -18,7 +18,6 @@
package org.apache.poi.hssf.record;
-import org.apache.poi.util.LittleEndian;
import org.apache.poi.hssf.util.RKUtil;
/**
@@ -216,7 +215,7 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
public boolean isBefore(CellValueRecordInterface i)
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
URL: http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java?rev=365561&r1=365560&r2=365561&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java (original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java Mon Jan 2 23:24:01 2006
@@ -148,6 +148,6 @@
public short getSid()
{
- return this.sid;
+ return sid;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/