moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

changed short param to int in AreaEval.containsColumn() method

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@891425 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2009-12-16 21:08:36 +00:00
parent 7ae214c7c7
commit 556622b05f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java
View File

@ -68,7 +68,7 @@ public interface AreaEval extends TwoDEval {
* returns true if the specified col is in range * returns true if the specified col is in range
* @param col * @param col
*/ */
boolean containsColumn(short col); boolean containsColumn(int col);
/** /**
* returns true if the specified row is in range * returns true if the specified row is in range

6
src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java
View File

@ -87,11 +87,11 @@ public abstract class AreaEvalBase implements AreaEval {
} }
public final boolean containsRow(int row) { public final boolean containsRow(int row) {
return (_firstRow <= row) && (_lastRow >= row); return _firstRow <= row && _lastRow >= row;
} }
public final boolean containsColumn(short col) { public final boolean containsColumn(int col) {
return (_firstColumn <= col) && (_lastColumn >= col); return _firstColumn <= col && _lastColumn >= col;
} }
public final boolean isColumn() { public final boolean isColumn() {

4
src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
View File

@ -102,7 +102,7 @@ public final class OperandResolver {
*/ */
public static ValueEval chooseSingleElementFromArea(AreaEval ae, public static ValueEval chooseSingleElementFromArea(AreaEval ae,
int srcCellRow, int srcCellCol) throws EvaluationException { int srcCellRow, int srcCellCol) throws EvaluationException {
ValueEval result = chooseSingleElementFromAreaInternal(ae, srcCellRow, (short) srcCellCol); ValueEval result = chooseSingleElementFromAreaInternal(ae, srcCellRow, srcCellCol);
if(result == null) { if(result == null) {
// This seems to be required because AreaEval.values() array may contain nulls. // This seems to be required because AreaEval.values() array may contain nulls.
// perhaps that should not be allowed. // perhaps that should not be allowed.
@ -119,7 +119,7 @@ public final class OperandResolver {
* @return possibly <tt>ErrorEval</tt>, and <code>null</code> * @return possibly <tt>ErrorEval</tt>, and <code>null</code>
*/ */
private static ValueEval chooseSingleElementFromAreaInternal(AreaEval ae, private static ValueEval chooseSingleElementFromAreaInternal(AreaEval ae,
int srcCellRow, short srcCellCol) throws EvaluationException { int srcCellRow, int srcCellCol) throws EvaluationException {
if(false) { if(false) {
// this is too simplistic // this is too simplistic