changed short to int in Function.evaluate() method signature

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@881704 13f79535-47bb-0310-9956-ffa450edef68

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 65ecb33d685509acbbc1ee61f2ddeff8c4cf9b56..0db4994b59693dfec262158a1ee78f8c9e685687 100644 (file)
--- 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 290bc9f74ec9745064fd68f2e41bc1713aa7cd07..b208bcd6471c3a6016d5eb5bc31d2829bf1d2794 100644 (file)
--- 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 8e202fdd26dca639cca82edc8b421b06fbcdbbf3..0d509cc4388f718f12ec3b0d3193ade376dda043 100644 (file)
--- 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 b1975a2121b78d92c72d2cfd4f94419a1587a134..bd821f0acbee4ac01bccf8f609500532840e7178 100644 (file)
--- 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 a07ea3baf5c428316e946f45922c2670662390d8..35cf5b43476b4f3558a22741adc54d33acbeb9b9 100644 (file)
--- 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 8b5043a7058c0067101f5829ede5f3236277b33c..1584e17bba26493095bbd54473d9364ee92244c6 100644 (file)
--- 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 764cfe1a45663d914c5456b9855cc504fcc93468..0d87ab036a03d1cdfef66344ab78ac953875be06 100644 (file)
--- 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 9b4a068fee9cd4f780c413eedd92b26db44762ce..e2b137b4b3d826b6514dc4efd548a102d7d91c57 100644 (file)
--- 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 ac5fea80c22932df3be04e24b4a3c9a22c81bdb8..4e959a61e53a241ee2018c24070c94832a5bb24a 100644 (file)
--- 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 90e8c1667516c99f7d684bc9000c431263184ae4..a4c445aa55c44e8ac4cfbb7e2915a2e10f05b74d 100644 (file)
--- 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 cafdd226f0f4fe729a388160de04834237a07a47..3495571340b49af170f6f2f12e30f4646784b1fb 100644 (file)
--- 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 e329abe3de7b24543cbfa3796bad4f366984dc32..e984cc2c7b0d7da9d7105d0b95009cb5cc1109b9 100644 (file)
--- 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 65050fe5000a913224eda600208189e42d6f3505..ca0e97f30558aad775b5f3f37ea2a99ab5b8cd74 100644 (file)
--- 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 dbb0987fbd434f621d66d2b91ff0fa1d680f6ad5..1c31d28b76a86213636ccca092a80309da0f0bfa 100644 (file)
--- 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 b60366ae8b1b671534181b34e386c17b2663fcdf..c71a5bd258bf3b0d7404b5a8a516ad744b91d866 100644 (file)
--- 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 f7d7538a99fcc0eb3dcda5df8d6860f64f7843f4..473976e330e1ea32dafcd41a8fbd575df7900173 100644 (file)
--- 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 f92bc1d1d8b2ab885805758e6b780be2a68e81c8..2b45debec9982896191883f565b819fb93133588 100644 (file)
--- 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 a2a2572587f5e79b6ca64a76720797eb40b89768..f96f3b2d8cbeb4e910462c39e279a774ec952019 100644 (file)
--- 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 c5ddc266ac74fd8ce6704972278b0f12827c2d72..74ade2d4072aaf3049c6472a33d75e6275fdf990 100644 (file)
--- 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 0e9e81b08e1f18b860b9313a8777d1923f733e7d..0341eac328bdd4e206eb020eac2272787f80636d 100644 (file)
--- 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 1aff51cf4fc96f80e391481785d6aef035d33133..92505ecd0342d4f280e64116e07c0c177567be81 100644 (file)
--- 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 7d6bec148904e7cd7fb44adb531a6e7a426be69c..0a25044f33364bd8f78d02b26e7e5674b02b5bf6 100644 (file)
--- 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 19659081ecd040dff1713564dfefe9e684021640..703af9716c143dc1747bdc2f86ab6b952b37ecab 100644 (file)
--- 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 1723f014bc2e02a6f4b7fcf965df7cfe3186f312..1cddb23d84b4273ccd9db48a699ba3ddcc3f6e65 100644 (file)
--- 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 261fc92a871de117d3a9f232f2ff6b0f5bed1078..49e7484fa7bb79ee67cdc70af36a67b6a12189ec 100644 (file)
--- 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 e220126d07e6f7606c9049c78c84877b96c0d4db..654f4d7968dcb22e4271b2099afc64cc80015898 100644 (file)
--- 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 a170405fe753609c92b1f43d36f3a5cab3f91b13..316a29ec4d80aa8146c052ee627014077fb2ad6c 100644 (file)
--- 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 5b9f6f51c4c621153214766a9cd3e8dc3a114b0c..60132c337fb9e565c50f4c035b45f26df53c17f6 100644 (file)
--- 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 87af93f8fe70df6df8a3c9d22cfc326561022d60..84eb80ba520eee8b401abc83c1d762709ba64349 100644 (file)
--- 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 fadad2ca7c76234d1109095715715c76fc973ac4..34221ec9f6a77b33f88768485b79980c942ef087 100644 (file)
--- 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 7bb3326d4ed32a78a64fa449efe3bf32cbb17651..fd90f1da4ac53e63d01e472b602ae0ba6d8833a1 100644 (file)
--- 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 c551235c452d4fd5df268e562d04036b2f9a6d6c..58e3684dfc0aba3f96fcc75ebad9d22c27104123 100644 (file)
--- 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 17c756162a9928fefa9d908d839bdff2dd72fe19..139b794caa3ef0de54e5145b11a130164594d534 100644 (file)
--- 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 c31cd08d1b0f778c21da924d9e1fe0d88ccd732f..81744de12d2adcb5ba45a5a8f429a1ddbc7f2a10 100644 (file)
--- 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 69aae428b456c6eded2b32616c643583144dedbc..40ae7cb7d38e3a5b80c8b208bc79f081e3c15488 100644 (file)
--- 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 d24a5994a909aef915d6f22addd880c21956dda8..e1f9fa612a22f46ff55d8c695233f07466d6e8f3 100644 (file)
--- 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 4e89ac30960a054b68df4fcfbe65ebc579e2dfc0..792ee3a02537826880a187fd210170c93a42e106 100644 (file)
--- 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 e243e87289c5918f6c70d78f8e865a4cd211031a..6815ed312fbfe2cbe46705369cf6482ed7592460 100644 (file)
--- 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 cb9687654b6a34bba6bfdd71cadf9ff3fb523a28..a56bf27052eb7d71a45e119e5f151bf82465b362 100644 (file)
--- 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 9dd6a84ce182b59c88e6aedc3e266f5c13a1d5ba..01ef88c3c68d47e2dc27860ee956592739848824 100644 (file)
--- 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 c3df6062ff6a090fbb2b346d25a96b942890a192..92b583bcb740e26e27340d3cd658bd64335f9555 100644 (file)
--- 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 3282c7d78664585ddcafcc41d54e624b69638baa..e31d6564d1a6782998e325191db296f6b87f06f8 100644 (file)
--- 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 5f5173e85610e34709660be1fc260e122ee22a4a..e1467a6e60f31ba9e1e03d680d05862945121ac3 100644 (file)
--- 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 3a32d6430872abdb8ad96b04cb3ee452ac0505ac..2298656e7cdb117b49d778e81e153ce67aa0f7a5 100644 (file)
--- 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 59c1203b75eb32a49e113e96102ac6992170170c..d0d0acb2c57b28bfb5b2759fd273fa77ca9945f2 100644 (file)
--- 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 77e347fe17eb7b282d92ac80fb0a1359f4bfb494..fb1b025342f859ce7a86d2ae9ff9e651aabd2160 100644 (file)
--- 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 287d9ff2fe1dff04a96fc81cdda9b5c403845650..0055bc6fe4297cc642ebd0e9ac640ec20aa1459a 100644 (file)
--- 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 e60d43befc2aa81525bb4d0a8322506364dbb1a7..4f6a59ad2a548c1e81f983e78004739f5a538a87 100644 (file)
--- 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 bc743e7197a9843b7eb232330ce2106f807d2d6f..8c2d2b173bcb391ee0c8e210c51f66cbb4a5d55b 100644 (file)
--- 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 6f13d4c5ee4ae574f29e19345fa053d41c36f243..54e31f8b483b595175d26cc2834157533711499e 100644 (file)
--- 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 b6ed8148de22f955f49c64d0cbd59d3f5d8389a5..360b8db768bb5558b8bb2bf5f398c69566792988 100644 (file)
--- 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 6acaec28712e881720fb688594e0917fbafbda2a..926ab3fed1fc9292897e0454d0d11c1bbc533887 100644 (file)
--- 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 434653c12cc824b90c1fbe40153652f7d7842289..f6705aae108bffb9d7b758159e2d0c5df68f3ab2 100644 (file)
--- 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 9a80c8d479b62608245853eb5b75e06b1a05e251..968999bcf573a75e5a9c97da8a0ab6e52ea082fe 100644 (file)
--- 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 cfa6dff4c9bccc8268021093de1c3108da7729d7..8067e742e6e4e611cd22a0e2d65973fabcd05a7f 100644 (file)
--- 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 f61ffdfade25051f0823b3a6eb4f68122b78b5b6..6c3ad929a62e16633312e667a144de2c70aa6282 100644 (file)
--- 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 c37c453f704039575d18cdc919c16e9d52e1fe03..21c43d4855a2ab190a792caa2d98c1e852430e8f 100644 (file)
--- 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;
                }