diff options
Diffstat (limited to 'src')
57 files changed, 74 insertions, 74 deletions
diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java index 65ecb33d68..0db4994b59 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java @@ -30,7 +30,7 @@ public final class ConcatEval implements Function { // enforce singleton } - public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if(args.length != 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java index 290bc9f74e..b208bcd647 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java @@ -30,7 +30,7 @@ public final class IntersectionEval implements Function { // enforces singleton } - public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if(args.length != 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java index 8e202fdd26..0d509cc438 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java @@ -32,7 +32,7 @@ public final class PercentEval implements Function { // enforce singleton } - public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if (args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java index b1975a2121..bd821f0acb 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java @@ -32,7 +32,7 @@ public final class RangeEval implements Function { // enforces singleton } - public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if(args.length != 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java index a07ea3baf5..35cf5b4347 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java @@ -55,7 +55,7 @@ public abstract class RelationalOperationEval implements Function { * Blank < Positive numbers * </pre> */ - public final ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public final ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { if (operands.length != 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java b/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java index 8b5043a705..1584e17bba 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java @@ -29,7 +29,7 @@ public abstract class TwoOperandNumericOperation implements Function { return OperandResolver.coerceValueToDouble(ve); } - public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { double result; try { double d0 = singleOperandEvaluate(args[0], srcCellRow, srcCellCol); diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java index 764cfe1a45..0d87ab036a 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java @@ -32,7 +32,7 @@ public final class UnaryMinusEval implements Function { // enforce singleton } - public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if (args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java index 9b4a068fee..e2b137b4b3 100644 --- a/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java +++ b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java @@ -32,7 +32,7 @@ public final class UnaryPlusEval implements Function { // enforce singleton } - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if(args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java index ac5fea80c2..4e959a61e5 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java @@ -38,7 +38,7 @@ import org.apache.poi.hssf.record.formula.eval.RefEval; */ public abstract class BooleanFunction implements Function { - public final ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) { + public final ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) { if (args.length < 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/CalendarFieldFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/CalendarFieldFunction.java index 90e8c16675..a4c445aa55 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/CalendarFieldFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/CalendarFieldFunction.java @@ -48,7 +48,7 @@ public final class CalendarFieldFunction implements Function { _needsOneBaseAdjustment = needsOneBaseAdjustment; } - public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) { if (operands.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java b/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java index cafdd226f0..3495571340 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Choose implements Function { - public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) { + public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { if (args.length < 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Column.java b/src/java/org/apache/poi/hssf/record/formula/functions/Column.java index e329abe3de..e984cc2c7b 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Column.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Column.java @@ -24,7 +24,7 @@ import org.apache.poi.hssf.record.formula.eval.RefEval; import org.apache.poi.hssf.record.formula.eval.ValueEval; public final class Column implements Function { - public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) { ValueEval retval = null; int cnum = -1; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java b/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java index 65050fe500..ca0e97f305 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java @@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Columns implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { switch(args.length) { case 1: // expected diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Count.java b/src/java/org/apache/poi/hssf/record/formula/functions/Count.java index dbb0987fbd..1c31d28b76 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Count.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Count.java @@ -36,7 +36,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate; */ public final class Count implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { int nArgs = args.length; if (nArgs < 1) { // too few arguments diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java b/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java index b60366ae8b..c71a5bd258 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java @@ -34,7 +34,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate; */ public final class Counta implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { int nArgs = args.length; if (nArgs < 1) { // too few arguments diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java index f7d7538a99..473976e330 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java @@ -38,7 +38,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate; */ public final class Countblank implements Function { - public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) { + public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { if (args.length != 1) { // TODO - it doesn't seem to be possible to enter COUNTBLANK() into Excel with the wrong arg count // perhaps this should be an exception diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java b/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java index f92bc1d1d8..2b45debec9 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java @@ -400,7 +400,7 @@ public final class Countif implements Function { } } - public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) { + public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { switch(args.length) { case 2: // expected diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java b/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java index a2a2572587..f96f3b2d8c 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java @@ -52,7 +52,7 @@ import org.apache.poi.hssf.usermodel.HSSFErrorConstants; */ public final class Errortype implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { try { OperandResolver.getSingleValue(args[0], srcCellRow, srcCellCol); diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/False.java b/src/java/org/apache/poi/hssf/record/formula/functions/False.java index c5ddc266ac..74ade2d407 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/False.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/False.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class False implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { ValueEval retval; switch (operands.length) { default: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Find.java b/src/java/org/apache/poi/hssf/record/formula/functions/Find.java index 0e9e81b08e..0341eac328 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Find.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Find.java @@ -36,7 +36,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Find extends TextFunction { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { int nArgs = args.length; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Function.java b/src/java/org/apache/poi/hssf/record/formula/functions/Function.java index 1aff51cf4f..92505ecd03 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Function.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Function.java @@ -39,5 +39,5 @@ public interface Function { * numeric functions evaluate to {@link Double#NaN} be sure to translate the result to {@link * ErrorEval#NUM_ERROR}. */ - ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex); + ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex); } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java index 7d6bec1489..0a25044f33 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java @@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector; */ public final class Hlookup implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { ValueEval arg3 = null; switch(args.length) { case 4: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java index 19659081ec..703af9716c 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java @@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Hyperlink implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { int lastArgIx = operands.length - 1; if (lastArgIx < 0 || lastArgIx > 1) { return ErrorEval.VALUE_INVALID; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/If.java b/src/java/org/apache/poi/hssf/record/formula/functions/If.java index 1723f014bc..1cddb23d84 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/If.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/If.java @@ -29,7 +29,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class If implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { ValueEval falseResult; switch (args.length) { case 3: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Index.java b/src/java/org/apache/poi/hssf/record/formula/functions/Index.java index 261fc92a87..49e7484fa7 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Index.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Index.java @@ -46,7 +46,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Index implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { int nArgs = args.length; if(nArgs < 2) { // too few arguments @@ -179,7 +179,7 @@ public final class Index implements Function { * @return the resolved 1-based index. Zero if the arg was missing or blank * @throws EvaluationException if the arg is an error value evaluates to a negative numeric value */ - private static int resolveIndexArg(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException { + private static int resolveIndexArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException { ValueEval ev = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol); if (ev == MissingArgEval.instance) { diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java b/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java index e220126d07..654f4d7968 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java @@ -28,7 +28,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class IsError implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) { if (operands.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java b/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java index a170405fe7..316a29ec4d 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java @@ -38,7 +38,7 @@ import org.apache.poi.ss.usermodel.ErrorConstants; */ public final class IsNa implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if(args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java index 5b9f6f51c4..60132c337f 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java @@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Isblank implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if(args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java index 87af93f8fe..84eb80ba52 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; * @author Amol S. Deshmukh < amolweb at ya hoo dot com > */ public final class Isref implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) { if (operands.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java index fadad2ca7c..34221ec9f6 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java @@ -45,7 +45,7 @@ public abstract class LogicalFunction implements Function { return retval; } - public final ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) { if (operands.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java index 7bb3326d4e..fd90f1da4a 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java @@ -40,7 +40,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector; */ public final class Lookup implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { switch(args.length) { case 3: break; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java b/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java index c551235c45..58e3684dfc 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java @@ -385,7 +385,7 @@ final class LookupUtils { * @return * @throws EvaluationException */ - public static boolean resolveRangeLookupArg(ValueEval rangeLookupArg, int srcCellRow, short srcCellCol) throws EvaluationException { + public static boolean resolveRangeLookupArg(ValueEval rangeLookupArg, int srcCellRow, int srcCellCol) throws EvaluationException { if(rangeLookupArg == null) { // range_lookup arg not provided return true; // default is TRUE diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Match.java b/src/java/org/apache/poi/hssf/record/formula/functions/Match.java index 17c756162a..139b794caa 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Match.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Match.java @@ -66,7 +66,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector; public final class Match implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { double match_type = 1; // default @@ -154,7 +154,7 @@ public final class Match implements Function { - private static double evaluateMatchTypeArg(ValueEval arg, int srcCellRow, short srcCellCol) + private static double evaluateMatchTypeArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException { ValueEval match_type = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol); diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java index c31cd08d1b..81744de12d 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java @@ -73,7 +73,7 @@ public final class Mode implements Function { } - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { double result; try { List<Double> temp = new ArrayList<Double>(); diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java index 69aae428b4..40ae7cb7d3 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java @@ -82,7 +82,7 @@ public abstract class MultiOperandNumericFunction implements Function { private static final int DEFAULT_MAX_NUM_OPERANDS = 30; - public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { double d; try { diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Na.java b/src/java/org/apache/poi/hssf/record/formula/functions/Na.java index d24a5994a9..e1f9fa612a 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Na.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Na.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Na implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { return ErrorEval.NA; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Not.java b/src/java/org/apache/poi/hssf/record/formula/functions/Not.java index 4e89ac3096..792ee3a025 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Not.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Not.java @@ -32,7 +32,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Not implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if (args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java index e243e87289..6815ed312f 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java @@ -38,7 +38,7 @@ public final class NotImplementedFunction implements Function { _functionName = name; } - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { throw new NotImplementedException(_functionName); } public String getFunctionName() { diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Now.java b/src/java/org/apache/poi/hssf/record/formula/functions/Now.java index cb9687654b..a56bf27052 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Now.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Now.java @@ -31,7 +31,7 @@ import org.apache.poi.hssf.usermodel.HSSFDateUtil; */ public final class Now implements Function { - public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) { if (evals.length > 0) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java index 9dd6a84ce1..01ef88c3c6 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java @@ -32,7 +32,7 @@ public abstract class NumericFunction implements Function { static final double TEN = 10.0; static final double LOG_10_TO_BASE_e = Math.log(TEN); - protected static final double singleOperandEvaluate(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException { + protected static final double singleOperandEvaluate(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException { ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol); double result = OperandResolver.coerceValueToDouble(ve); checkValue(result); @@ -45,7 +45,7 @@ public abstract class NumericFunction implements Function { } } - public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { double result; try { result = eval(args, srcCellRow, srcCellCol); @@ -56,7 +56,7 @@ public abstract class NumericFunction implements Function { return new NumberEval(result); } - protected abstract double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException; + protected abstract double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException; /* -------------------------------------------------------------------------- */ // intermediate sub-classes (one-arg, two-arg and multi-arg) @@ -65,7 +65,7 @@ public abstract class NumericFunction implements Function { protected OneArg() { // no fields to initialise } - protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException { + protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 1) { throw new EvaluationException(ErrorEval.VALUE_INVALID); } @@ -79,7 +79,7 @@ public abstract class NumericFunction implements Function { protected TwoArg() { // no fields to initialise } - protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException { + protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 2) { throw new EvaluationException(ErrorEval.VALUE_INVALID); } @@ -97,7 +97,7 @@ public abstract class NumericFunction implements Function { _minArgs = minArgs; _maxArgs = maxArgs; } - protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException { + protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { int nArgs = args.length; if (nArgs < _minArgs || nArgs > _maxArgs) { throw new EvaluationException(ErrorEval.VALUE_INVALID); diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java b/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java index c3df6062ff..92b583bcb7 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java @@ -163,7 +163,7 @@ public final class Offset implements Function { } } - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if(args.length < 3 || args.length > 5) { return ErrorEval.VALUE_INVALID; } @@ -223,7 +223,7 @@ public final class Offset implements Function { /** * OFFSET's numeric arguments (2..5) have similar processing rules */ - private static int evaluateIntArg(ValueEval eval, int srcCellRow, short srcCellCol) throws EvaluationException { + private static int evaluateIntArg(ValueEval eval, int srcCellRow, int srcCellCol) throws EvaluationException { double d = evaluateDoubleArg(eval, srcCellRow, srcCellCol); return convertDoubleToInt(d); @@ -239,7 +239,7 @@ public final class Offset implements Function { return (int)Math.floor(d); } - private static double evaluateDoubleArg(ValueEval eval, int srcCellRow, short srcCellCol) throws EvaluationException { + private static double evaluateDoubleArg(ValueEval eval, int srcCellRow, int srcCellCol) throws EvaluationException { ValueEval ve = OperandResolver.getSingleValue(eval, srcCellRow, srcCellCol); if (ve instanceof NumericValueEval) { diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java b/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java index 3282c7d786..e31d6564d1 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java @@ -29,7 +29,7 @@ public final class Pi implements Function { private static final NumberEval PI_EVAL = new NumberEval(Math.PI); - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { ValueEval retval; switch (operands.length) { default: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java index 5f5173e856..e1467a6e60 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Rand implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { ValueEval retval; switch (operands.length) { default: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java b/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java index 3a32d64308..2298656e7c 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java @@ -39,7 +39,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Replace extends TextFunction { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 4) { return ErrorEval.VALUE_INVALID; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Row.java b/src/java/org/apache/poi/hssf/record/formula/functions/Row.java index 59c1203b75..d0d0acb2c5 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Row.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Row.java @@ -25,7 +25,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; public final class Row implements Function { - public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) { ValueEval retval = null; int rnum = -1; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java index 77e347fe17..fb1b025342 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java @@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Rows implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { switch(args.length) { case 1: // expected diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java b/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java index 287d9ff2fe..0055bc6fe4 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java @@ -29,7 +29,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class Substitute extends TextFunction { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length < 3 || args.length > 4) { return ErrorEval.VALUE_INVALID; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java index e60d43befc..4f6a59ad2a 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java @@ -40,7 +40,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate; */ public final class Sumif implements Function { - public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) { + public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { if (args.length < 2) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java index bc743e7197..8c2d2b173b 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java @@ -53,7 +53,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; public final class Sumproduct implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { int maxN = args.length; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/T.java b/src/java/org/apache/poi/hssf/record/formula/functions/T.java index 6f13d4c5ee..54e31f8b48 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/T.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/T.java @@ -24,7 +24,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; public final class T implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { switch (args.length) { default: return ErrorEval.VALUE_INVALID; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java index b6ed8148de..360b8db768 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java @@ -33,16 +33,16 @@ public abstract class TextFunction implements Function { protected static final String EMPTY_STRING = ""; - protected static final String evaluateStringArg(ValueEval eval, int srcRow, short srcCol) throws EvaluationException { + protected static final String evaluateStringArg(ValueEval eval, int srcRow, int srcCol) throws EvaluationException { ValueEval ve = OperandResolver.getSingleValue(eval, srcRow, srcCol); return OperandResolver.coerceValueToString(ve); } - protected static final int evaluateIntArg(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException { + protected static final int evaluateIntArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException { ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol); return OperandResolver.coerceValueToInt(ve); } - public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { try { return evaluateFunc(args, srcCellRow, srcCellCol); } catch (EvaluationException e) { @@ -50,7 +50,7 @@ public abstract class TextFunction implements Function { } } - protected abstract ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException; + protected abstract ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException; /* ---------------------------------------------------------------------- */ @@ -59,7 +59,7 @@ public abstract class TextFunction implements Function { protected SingleArgTextFunc() { // no fields to initialise } - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 1) { return ErrorEval.VALUE_INVALID; @@ -109,7 +109,7 @@ public abstract class TextFunction implements Function { */ public static final Function MID = new TextFunction() { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 3) { return ErrorEval.VALUE_INVALID; @@ -144,7 +144,7 @@ public abstract class TextFunction implements Function { protected LeftRight(boolean isLeft) { _isLeft = isLeft; } - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 2) { return ErrorEval.VALUE_INVALID; @@ -167,7 +167,7 @@ public abstract class TextFunction implements Function { public static final Function CONCATENATE = new TextFunction() { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { StringBuffer sb = new StringBuffer(); for (int i=0, iSize=args.length; i<iSize; i++) { @@ -179,7 +179,7 @@ public abstract class TextFunction implements Function { public static final Function EXACT = new TextFunction() { - protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) + protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException { if (args.length != 2) { return ErrorEval.VALUE_INVALID; diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Time.java b/src/java/org/apache/poi/hssf/record/formula/functions/Time.java index 6acaec2871..926ab3fed1 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Time.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Time.java @@ -37,7 +37,7 @@ public final class Time implements Function { private static final int SECONDS_PER_DAY = HOURS_PER_DAY * SECONDS_PER_HOUR; - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if (args.length != 3) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Today.java b/src/java/org/apache/poi/hssf/record/formula/functions/Today.java index 434653c12c..f6705aae10 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Today.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Today.java @@ -32,7 +32,7 @@ import org.apache.poi.hssf.usermodel.HSSFDateUtil; */ public final class Today implements Function { - public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) { if (evals.length > 0) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/True.java b/src/java/org/apache/poi/hssf/record/formula/functions/True.java index 9a80c8d479..968999bcf5 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/True.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/True.java @@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval; */ public final class True implements Function { - public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) { + public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) { ValueEval retval; switch (operands.length) { default: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Value.java b/src/java/org/apache/poi/hssf/record/formula/functions/Value.java index cfa6dff4c9..8067e742e6 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Value.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Value.java @@ -41,7 +41,7 @@ public final class Value implements Function { private static final int MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR = 4; private static final Double ZERO = new Double(0.0); - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if (args.length != 1) { return ErrorEval.VALUE_INVALID; } diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java index f61ffdfade..6c3ad929a6 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java @@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector; */ public final class Vlookup implements Function { - public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { ValueEval arg3 = null; switch(args.length) { case 4: diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java index c37c453f70..21c43d4855 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java @@ -96,7 +96,7 @@ public abstract class XYNumericFunction implements Function { */ protected abstract Accumulator createAccumulator(); - public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) { + public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) { if (args.length != 2) { return ErrorEval.VALUE_INVALID; } |