modified MultiOperandNumericFunction to use TwoDEval

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

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 fab88df49a82e4b0da1de4e3134a11a39183ddc2..cac7ca6e35336c74488a3c9383418125e49fab42 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
@@ -17,7 +17,6 @@
 
 package org.apache.poi.hssf.record.formula.functions;
 
-import org.apache.poi.hssf.record.formula.eval.AreaEval;
 import org.apache.poi.hssf.record.formula.eval.BlankEval;
 import org.apache.poi.hssf.record.formula.eval.BoolEval;
 import org.apache.poi.hssf.record.formula.eval.ErrorEval;
@@ -27,6 +26,7 @@ import org.apache.poi.hssf.record.formula.eval.OperandResolver;
 import org.apache.poi.hssf.record.formula.eval.RefEval;
 import org.apache.poi.hssf.record.formula.eval.StringEval;
 import org.apache.poi.hssf.record.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.TwoDEval;
 
 /**
  * @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -134,13 +134,13 @@ public abstract class MultiOperandNumericFunction implements Function {
         */
        private void collectValues(ValueEval operand, DoubleList temp) throws EvaluationException {
 
-               if (operand instanceof AreaEval) {
-                       AreaEval ae = (AreaEval) operand;
+               if (operand instanceof TwoDEval) {
+                       TwoDEval ae = (TwoDEval) operand;
                        int width = ae.getWidth();
                        int height = ae.getHeight();
                        for (int rrIx=0; rrIx<height; rrIx++) {
                                for (int rcIx=0; rcIx<width; rcIx++) {
-                                       ValueEval ve = ae.getRelativeValue(rrIx, rcIx);
+                                       ValueEval ve = ae.getValue(rrIx, rcIx);
                                        collectValue(ve, true, temp);
                                }
                        }