diff --git a/src/java/org/apache/poi/ddf/EscherArrayProperty.java b/src/java/org/apache/poi/ddf/EscherArrayProperty.java index a5fd1a969..6954fdcde 100644 --- a/src/java/org/apache/poi/ddf/EscherArrayProperty.java +++ b/src/java/org/apache/poi/ddf/EscherArrayProperty.java @@ -20,9 +20,6 @@ package org.apache.poi.ddf; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.HexDump; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - /** * Escher array properties are the most wierd construction ever invented * with all sorts of special cases. I'm hopeful I've got them all. diff --git a/src/java/org/apache/poi/hssf/record/FontRecord.java b/src/java/org/apache/poi/hssf/record/FontRecord.java index 4e1360ed6..94b8707b6 100644 --- a/src/java/org/apache/poi/hssf/record/FontRecord.java +++ b/src/java/org/apache/poi/hssf/record/FontRecord.java @@ -522,7 +522,7 @@ public class FontRecord data[ 14 + offset ] = getUnderline(); data[ 15 + offset ] = getFamily(); data[ 16 + offset ] = getCharset(); - data[ 17 + offset ] = (( byte ) 0); + data[ 17 + offset ] = field_9_zero; data[ 18 + offset ] = getFontNameLength(); data[ 19 + offset ] = ( byte ) 1; if (getFontName() != null) { diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java index ee31d75f6..982637465 100644 --- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java +++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java @@ -50,13 +50,29 @@ public class SelectionRecord private short field_1_first_row; private short field_2_last_row; private byte field_3_first_column; - private byte field_3_last_column; + private byte field_4_last_column; - public Reference(RecordInputStream in) { + Reference(RecordInputStream in) { field_1_first_row = in.readShort(); field_2_last_row = in.readShort(); field_3_first_column = in.readByte(); - field_3_last_column = in.readByte(); + field_4_last_column = in.readByte(); + } + + public short getFirstRow() { + return field_1_first_row; + } + + public short getLastRow() { + return field_2_last_row; + } + + public byte getFirstColumn() { + return field_3_first_column; + } + + public byte getLastColumn() { + return field_4_last_column; } } diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java index a90ff34be..dfabefe22 100644 --- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java +++ b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java @@ -165,7 +165,7 @@ public class WSBoolRecord public void setWSBool2(byte bool2) { - field_2_wsbool = field_2_wsbool = bool2; + field_2_wsbool = bool2; } // bool2 bitfields diff --git a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java index dbb1ab2ac..05562a31a 100644 --- a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java @@ -40,9 +40,6 @@ public class IntPtg public final static int SIZE = 3; public final static byte sid = 0x1e; private short field_1_value; - - private String val; - private int strlen = 0; private IntPtg() { //Required for clone methods diff --git a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java index b0f28195c..fea9cf7f8 100644 --- a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java @@ -29,8 +29,6 @@ public class MultiplyPtg { public final static int SIZE = 1; public final static byte sid = 0x05; - - private final static String MULTIPLY="*"; /** Creates new AddPtg */ diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryNode.java b/src/java/org/apache/poi/poifs/filesystem/EntryNode.java index f2686532a..7edc1f0d9 100644 --- a/src/java/org/apache/poi/poifs/filesystem/EntryNode.java +++ b/src/java/org/apache/poi/poifs/filesystem/EntryNode.java @@ -18,10 +18,6 @@ package org.apache.poi.poifs.filesystem; -import java.io.*; - -import java.util.*; - import org.apache.poi.poifs.property.Property; /** diff --git a/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java b/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java index 8353d2919..5c93501a6 100644 --- a/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java +++ b/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java @@ -19,7 +19,6 @@ package org.apache.poi.poifs.storage; import java.io.IOException; -import java.io.OutputStream; import java.util.*; diff --git a/src/java/org/apache/poi/util/POILogFactory.java b/src/java/org/apache/poi/util/POILogFactory.java index 383ceb006..9abf21ed8 100644 --- a/src/java/org/apache/poi/util/POILogFactory.java +++ b/src/java/org/apache/poi/util/POILogFactory.java @@ -18,9 +18,6 @@ package org.apache.poi.util; -import java.io.FileInputStream; -import java.io.IOException; - import java.util.*; /** diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java index e53042e62..24de6b583 100644 --- a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java +++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java @@ -24,12 +24,8 @@ import org.apache.poi.hdf.extractor.util.*; import org.apache.poi.hdf.extractor.data.*; import java.util.*; import java.io.*; -import javax.swing.*; - -import java.awt.*; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.apache.poi.poifs.filesystem.POIFSDocument; import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.util.LittleEndian; diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java index 680e63edb..09db5ed91 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java @@ -20,11 +20,8 @@ package org.apache.poi.hslf.dev; import org.apache.poi.hslf.*; -import org.apache.poi.hslf.model.*; import org.apache.poi.hslf.record.*; -import org.apache.poi.hslf.usermodel.*; -import java.io.*; /** * Uses record level code to locate PPDrawing entries. diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java index 47add9ff6..e6b7bb31a 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java @@ -20,11 +20,7 @@ package org.apache.poi.hslf.dev; import org.apache.poi.hslf.*; -import org.apache.poi.hslf.model.*; import org.apache.poi.hslf.record.*; -import org.apache.poi.hslf.usermodel.*; - -import java.io.*; /** * Uses record level code to locate SlideListWithText entries. diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java index dc23e0896..d24893f7d 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java @@ -22,7 +22,6 @@ package org.apache.poi.hslf.dev; import org.apache.poi.hslf.*; import org.apache.poi.hslf.record.*; -import java.io.*; /** * Uses record level code to locate Notes and Slide records. diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java index 9aed8172d..545b9ec09 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java @@ -20,12 +20,9 @@ package org.apache.poi.hslf.dev; import org.apache.poi.hslf.*; -import org.apache.poi.hslf.model.*; import org.apache.poi.hslf.record.*; import org.apache.poi.hslf.record.StyleTextPropAtom.*; -import org.apache.poi.hslf.usermodel.*; -import java.io.*; import java.util.LinkedList; /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java index e546217bb..5e4083ad7 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java @@ -18,8 +18,6 @@ package org.apache.poi.hslf.model; import org.apache.poi.ddf.*; -import java.awt.*; - /** * Represents a autoshape in a PowerPoint drawing * diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Line.java b/src/scratchpad/src/org/apache/poi/hslf/model/Line.java index a94130ed3..140797698 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Line.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Line.java @@ -18,8 +18,6 @@ package org.apache.poi.hslf.model; import org.apache.poi.ddf.*; -import java.awt.*; - /** * Represents a line in a PowerPoint drawing * diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java b/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java index 0a51ed8f7..fe8788b97 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java @@ -17,8 +17,6 @@ package org.apache.poi.hslf.model; import org.apache.poi.ddf.*; import org.apache.poi.hslf.model.ShapeTypes; - -import java.awt.*; import java.util.Iterator; /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java index 74495d03b..98998011d 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java @@ -21,7 +21,6 @@ package org.apache.poi.hslf.record; import org.apache.poi.util.LittleEndian; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; /** * If we come across a record we know has children of (potential) diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java index eb7478fde..533ba1d63 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java @@ -21,7 +21,6 @@ package org.apache.poi.hslf.record; import org.apache.poi.util.LittleEndian; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; /** * If we come across a record we know has children of (potential) diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java b/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java index f7506d83b..67792ac77 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java @@ -18,10 +18,8 @@ package org.apache.poi.hslf.record; -import org.apache.poi.util.LittleEndian; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; /** * Master container for Notes. There is one of these for every page of diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java index 1a8470fda..cbe5aa905 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java @@ -21,7 +21,6 @@ package org.apache.poi.hslf.record; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; import java.util.Vector; import org.apache.poi.util.LittleEndian; import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java index 770d0fbfe..90aa2984c 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java @@ -22,7 +22,6 @@ import org.apache.poi.util.LittleEndian; import org.apache.poi.util.StringUtil; import java.io.IOException; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; /** * A TextCharsAtom (type 4000). Holds text in byte swapped unicode form. diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java b/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java index 3111a4215..a1c3ebf3d 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java +++ b/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java @@ -237,7 +237,7 @@ public class ValueEvalToNumericXlator { String s = sve.getStringValue(); try { boolean b = Boolean.getBoolean(s); - retval = retval = b ? BoolEval.TRUE : BoolEval.FALSE;; + retval = b ? BoolEval.TRUE : BoolEval.FALSE;; } catch (Exception e) { retval = ErrorEval.VALUE_INVALID; } } diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java b/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java index bca546390..7afc5cced 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java +++ b/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java @@ -32,7 +32,7 @@ public class And extends BooleanFunction { AreaEval ae = (AreaEval) operands[i]; ValueEval[] values = ae.getValues(); for (int j=0, jSize=values.length; j