376 files changed, 7 insertions, 5 deletions

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 6b42cfa826..ab9a4c796e 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -35,7 +35,8 @@
     </devs>
 
 		<!-- Don't forget to update status.xml too! -->
-        <release version="3.0.3-beta1" date="2008-??-??">
+        <release version="3.0.3-beta1" date="2008-04-??">
+           <action dev="POI-DEVELOPERS" type="add">Move the Formula Evaluator code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">Move the missing record aware eventusermodel code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">44652 / 44603 - Improved handling of Pictures in Word Documents</action>
            <action dev="POI-DEVELOPERS" type="fix">44636 - Fix formula parsing of RefVPtg, which was causing #VALUE to be shown on subsequent edits</action>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index d7a09d54d8..14c7b817a1 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -32,7 +32,8 @@
 
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
-        <release version="3.0.3-beta1" date="2008-??-??">
+        <release version="3.0.3-beta1" date="2008-04-??">
+           <action dev="POI-DEVELOPERS" type="add">Move the Formula Evaluator code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">Move the missing record aware eventusermodel code out of scratchpad</action>
            <action dev="POI-DEVELOPERS" type="add">44652 / 44603 - Improved handling of Pictures in Word Documents</action>
            <action dev="POI-DEVELOPERS" type="fix">44636 - Fix formula parsing of RefVPtg, which was causing #VALUE to be shown on subsequent edits</action>
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/AddEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/AddEval.java
index 6562263d54..6562263d54 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/AddEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/AddEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area2DEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/Area2DEval.java
index 4b9a64c1c0..4b9a64c1c0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area2DEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/Area2DEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area3DEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/Area3DEval.java
index 2f539142d1..2f539142d1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area3DEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/Area3DEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/AreaEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java
index 82cc8a9b40..82cc8a9b40 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/AreaEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/BlankEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java
index df671821fe..df671821fe 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/BlankEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/BoolEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java
index 7b625aaa98..7b625aaa98 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/BoolEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ConcatEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
index e54cd483f1..e54cd483f1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/DivideEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/DivideEval.java
index 021168ad79..021168ad79 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/DivideEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/DivideEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/EqualEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/EqualEval.java
index e7b169294e..e7b169294e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/EqualEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/EqualEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ErrorEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java
index e8e197d201..e8e197d201 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ErrorEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Eval.java b/src/java/org/apache/poi/hssf/record/formula/eval/Eval.java
index 086b765a30..086b765a30 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Eval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/Eval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/EvaluationException.java b/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java
index 7a23901b25..7a23901b25 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/EvaluationException.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ExternalFunction.java b/src/java/org/apache/poi/hssf/record/formula/eval/ExternalFunction.java
index b1d81e6524..b1d81e6524 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ExternalFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/ExternalFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/FuncVarEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/FuncVarEval.java
index 375d6b35da..375d6b35da 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/FuncVarEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/FuncVarEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/FunctionEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java
index 533c604a0c..533c604a0c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/FunctionEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/GreaterEqualEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/GreaterEqualEval.java
index 6a9a23217b..6a9a23217b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/GreaterEqualEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/GreaterEqualEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/GreaterThanEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/GreaterThanEval.java
index 27da54a046..27da54a046 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/GreaterThanEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/GreaterThanEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/LessEqualEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/LessEqualEval.java
index e45bf9e6bb..e45bf9e6bb 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/LessEqualEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/LessEqualEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/LessThanEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/LessThanEval.java
index 1aac6f73bf..1aac6f73bf 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/LessThanEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/LessThanEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/MultiplyEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/MultiplyEval.java
index 22d87b7e4d..22d87b7e4d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/MultiplyEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/MultiplyEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NameEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java
index 682394b3c2..682394b3c2 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NameEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NotEqualEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/NotEqualEval.java
index c5388f520f..c5388f520f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NotEqualEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/NotEqualEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumberEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java
index 44a017f631..44a017f631 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumberEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumericOperationEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/NumericOperationEval.java
index 6bc1c95dc1..6bc1c95dc1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumericOperationEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/NumericOperationEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java
index d5b92b8080..d5b92b8080 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/OperandResolver.java b/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
index be1cda5f8e..be1cda5f8e 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/OperationEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/OperationEval.java
index aefd5aefad..aefd5aefad 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/OperationEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/OperationEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/PercentEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java
index c698a4e502..c698a4e502 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/PercentEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/PowerEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/PowerEval.java
index 651c5d2aa2..651c5d2aa2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/PowerEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/PowerEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref2DEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/Ref2DEval.java
index 898d7a8618..898d7a8618 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref2DEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/Ref2DEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref3DEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/Ref3DEval.java
index 622d686329..622d686329 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref3DEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/Ref3DEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/RefEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
index e462586d72..e462586d72 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/RefEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
index 9b1a2ece4f..9b1a2ece4f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java
index 27a9c6a627..27a9c6a627 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringOperationEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/StringOperationEval.java
index e2a3c72a4c..e2a3c72a4c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringOperationEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/StringOperationEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringValueEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java
index 46c12236b9..46c12236b9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/StringValueEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/SubtractEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/SubtractEval.java
index 85a3845299..85a3845299 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/SubtractEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/SubtractEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
index ef6f533ea5..ef6f533ea5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
index edcc7bee79..edcc7bee79 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java
index 4581fa4d6e..4581fa4d6e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java b/src/java/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java
index 1abcf34d2b..1abcf34d2b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/ValueEvalToNumericXlator.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Abs.java b/src/java/org/apache/poi/hssf/record/formula/functions/Abs.java
index 1bebb358bb..1bebb358bb 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Abs.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Abs.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Absref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Absref.java
index 3a6e94a66e..3a6e94a66e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Absref.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Absref.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Acos.java b/src/java/org/apache/poi/hssf/record/formula/functions/Acos.java
index bc5b5720ee..bc5b5720ee 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Acos.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Acos.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Acosh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Acosh.java
index 794516e57f..794516e57f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Acosh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Acosh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Activecell.java b/src/java/org/apache/poi/hssf/record/formula/functions/Activecell.java
index 17b04137af..17b04137af 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Activecell.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Activecell.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Address.java b/src/java/org/apache/poi/hssf/record/formula/functions/Address.java
index 9b408e0d34..9b408e0d34 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Address.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Address.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java b/src/java/org/apache/poi/hssf/record/formula/functions/And.java
index 455772f737..455772f737 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/And.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/And.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Areas.java b/src/java/org/apache/poi/hssf/record/formula/functions/Areas.java
index a54b3e7188..a54b3e7188 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Areas.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Areas.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Argument.java b/src/java/org/apache/poi/hssf/record/formula/functions/Argument.java
index d07b6d6a02..d07b6d6a02 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Argument.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Argument.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asc.java b/src/java/org/apache/poi/hssf/record/formula/functions/Asc.java
index 295aba29ae..295aba29ae 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asc.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Asc.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asin.java b/src/java/org/apache/poi/hssf/record/formula/functions/Asin.java
index 868ff7a8dd..868ff7a8dd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asin.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Asin.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asinh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Asinh.java
index 8814dc3f89..8814dc3f89 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Asinh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Asinh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atan.java b/src/java/org/apache/poi/hssf/record/formula/functions/Atan.java
index 8266ad24d4..8266ad24d4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atan.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Atan.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atan2.java b/src/java/org/apache/poi/hssf/record/formula/functions/Atan2.java
index a0ff7b00c0..a0ff7b00c0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atan2.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Atan2.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atanh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Atanh.java
index d472b1f00e..d472b1f00e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Atanh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Atanh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Avedev.java b/src/java/org/apache/poi/hssf/record/formula/functions/Avedev.java
index bf888b97df..bf888b97df 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Avedev.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Avedev.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Average.java b/src/java/org/apache/poi/hssf/record/formula/functions/Average.java
index 4043040713..4043040713 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Average.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Average.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Averagea.java b/src/java/org/apache/poi/hssf/record/formula/functions/Averagea.java
index e9eb83eaf4..e9eb83eaf4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Averagea.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Averagea.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Betadist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Betadist.java
index 87992f2d53..87992f2d53 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Betadist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Betadist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Betainv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Betainv.java
index 219eaf5e52..219eaf5e52 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Betainv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Betainv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Binomdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Binomdist.java
index 6a13a25c79..6a13a25c79 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Binomdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Binomdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java
index b3e56cfdc6..b3e56cfdc6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Call.java b/src/java/org/apache/poi/hssf/record/formula/functions/Call.java
index a1cb4ca376..a1cb4ca376 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Call.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Call.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Caller.java b/src/java/org/apache/poi/hssf/record/formula/functions/Caller.java
index 206d08a703..206d08a703 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Caller.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Caller.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ceiling.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ceiling.java
index a158b856bc..a158b856bc 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ceiling.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ceiling.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cell.java b/src/java/org/apache/poi/hssf/record/formula/functions/Cell.java
index ffbd322395..ffbd322395 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cell.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Cell.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Char.java b/src/java/org/apache/poi/hssf/record/formula/functions/Char.java
index 2c4271dc70..2c4271dc70 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Char.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Char.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chidist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Chidist.java
index b431fe361a..b431fe361a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chidist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Chidist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chiinv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Chiinv.java
index c2d45b0e6e..c2d45b0e6e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chiinv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Chiinv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chitest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Chitest.java
index b7065b0ea6..b7065b0ea6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Chitest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Chitest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Choose.java b/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java
index e7acc93c48..e7acc93c48 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Choose.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Choose.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Clean.java b/src/java/org/apache/poi/hssf/record/formula/functions/Clean.java
index cc01655d57..cc01655d57 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Clean.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Clean.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Code.java b/src/java/org/apache/poi/hssf/record/formula/functions/Code.java
index e340a5757d..e340a5757d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Code.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Code.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Column.java b/src/java/org/apache/poi/hssf/record/formula/functions/Column.java
index adde35c162..adde35c162 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Column.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Column.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Columns.java b/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java
index b75864e72d..b75864e72d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Columns.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Columns.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Combin.java b/src/java/org/apache/poi/hssf/record/formula/functions/Combin.java
index 72d6d4691e..72d6d4691e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Combin.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Combin.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Concatenate.java b/src/java/org/apache/poi/hssf/record/formula/functions/Concatenate.java
index be961c151e..be961c151e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Concatenate.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Concatenate.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Confidence.java b/src/java/org/apache/poi/hssf/record/formula/functions/Confidence.java
index 0d30a8de49..0d30a8de49 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Confidence.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Confidence.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Correl.java b/src/java/org/apache/poi/hssf/record/formula/functions/Correl.java
index 53cf4fd796..53cf4fd796 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Correl.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Correl.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cos.java b/src/java/org/apache/poi/hssf/record/formula/functions/Cos.java
index f262797662..f262797662 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cos.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Cos.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cosh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Cosh.java
index 41c8650693..41c8650693 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Cosh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Cosh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Count.java b/src/java/org/apache/poi/hssf/record/formula/functions/Count.java
index 736c37c1b7..736c37c1b7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Count.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Count.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Counta.java b/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java
index 9061e77e5d..9061e77e5d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Counta.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Counta.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Countblank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java
index cdb0713a72..cdb0713a72 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Countblank.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Countif.java b/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java
index 2e445a8bf6..2e445a8bf6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Countif.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Countif.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Covar.java b/src/java/org/apache/poi/hssf/record/formula/functions/Covar.java
index fc1188992d..fc1188992d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Covar.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Covar.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Critbinom.java b/src/java/org/apache/poi/hssf/record/formula/functions/Critbinom.java
index 3a3d1a67b9..3a3d1a67b9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Critbinom.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Critbinom.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Customrepeat.java b/src/java/org/apache/poi/hssf/record/formula/functions/Customrepeat.java
index 4206a173fa..4206a173fa 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Customrepeat.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Customrepeat.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Date.java b/src/java/org/apache/poi/hssf/record/formula/functions/Date.java
index 6861a02524..6861a02524 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Date.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Date.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datedif.java b/src/java/org/apache/poi/hssf/record/formula/functions/Datedif.java
index 1a14516049..1a14516049 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datedif.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Datedif.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datestring.java b/src/java/org/apache/poi/hssf/record/formula/functions/Datestring.java
index 0a80110b79..0a80110b79 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datestring.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Datestring.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datevalue.java b/src/java/org/apache/poi/hssf/record/formula/functions/Datevalue.java
index a0377527cf..a0377527cf 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Datevalue.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Datevalue.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Daverage.java b/src/java/org/apache/poi/hssf/record/formula/functions/Daverage.java
index ebf9c28bce..ebf9c28bce 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Daverage.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Daverage.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Day.java b/src/java/org/apache/poi/hssf/record/formula/functions/Day.java
index 0ae5694767..0ae5694767 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Day.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Day.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Days360.java b/src/java/org/apache/poi/hssf/record/formula/functions/Days360.java
index 2187576429..2187576429 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Days360.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Days360.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Db.java b/src/java/org/apache/poi/hssf/record/formula/functions/Db.java
index 1dd80b6af7..1dd80b6af7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Db.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Db.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dbcs.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dbcs.java
index 30ad221bcf..30ad221bcf 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dbcs.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dbcs.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dcount.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dcount.java
index 1d64ae2595..1d64ae2595 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dcount.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dcount.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dcounta.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dcounta.java
index 72d36bc0fd..72d36bc0fd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dcounta.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dcounta.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ddb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ddb.java
index 66b5a33e08..66b5a33e08 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ddb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ddb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Degrees.java b/src/java/org/apache/poi/hssf/record/formula/functions/Degrees.java
index e85e14d567..e85e14d567 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Degrees.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Degrees.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Deref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Deref.java
index bb773522b2..bb773522b2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Deref.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Deref.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Devsq.java b/src/java/org/apache/poi/hssf/record/formula/functions/Devsq.java
index a198ff8398..a198ff8398 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Devsq.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Devsq.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dget.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dget.java
index ebd846333b..ebd846333b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dget.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dget.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dmax.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dmax.java
index 18ea2bdc7b..18ea2bdc7b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dmax.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dmax.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dmin.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dmin.java
index 9307af584a..9307af584a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dmin.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dmin.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dollar.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dollar.java
index a65f65a3e7..a65f65a3e7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dollar.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dollar.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dproduct.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dproduct.java
index bf86748d2c..bf86748d2c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dproduct.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dproduct.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dstdev.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dstdev.java
index 0cdb4c237f..0cdb4c237f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dstdev.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dstdev.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dstdevp.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dstdevp.java
index e9a2bfaf13..e9a2bfaf13 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dstdevp.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dstdevp.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dsum.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dsum.java
index 3c057ca28b..3c057ca28b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dsum.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dsum.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dvar.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dvar.java
index 764cf618c4..764cf618c4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dvar.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dvar.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dvarp.java b/src/java/org/apache/poi/hssf/record/formula/functions/Dvarp.java
index 03928b77d4..03928b77d4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Dvarp.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Dvarp.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Echo.java b/src/java/org/apache/poi/hssf/record/formula/functions/Echo.java
index 87d4e29bf8..87d4e29bf8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Echo.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Echo.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Error.java b/src/java/org/apache/poi/hssf/record/formula/functions/Error.java
index 41a7ecd9d4..41a7ecd9d4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Error.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Error.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Errortype.java b/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java
index 51268c9aa0..51268c9aa0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Errortype.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Evaluate.java b/src/java/org/apache/poi/hssf/record/formula/functions/Evaluate.java
index d458875406..d458875406 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Evaluate.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Evaluate.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Even.java b/src/java/org/apache/poi/hssf/record/formula/functions/Even.java
index 9149671676..9149671676 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Even.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Even.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exact.java b/src/java/org/apache/poi/hssf/record/formula/functions/Exact.java
index 63dc18d771..63dc18d771 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exact.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Exact.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exec.java b/src/java/org/apache/poi/hssf/record/formula/functions/Exec.java
index 327ba77f4e..327ba77f4e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exec.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Exec.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exp.java b/src/java/org/apache/poi/hssf/record/formula/functions/Exp.java
index d0b122ab16..d0b122ab16 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Exp.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Exp.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Expondist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Expondist.java
index 5ba8727d9d..5ba8727d9d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Expondist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Expondist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fact.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fact.java
index 128b167c65..128b167c65 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fact.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fact.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/False.java b/src/java/org/apache/poi/hssf/record/formula/functions/False.java
index 2a16b1c73a..2a16b1c73a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/False.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/False.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fdist.java
index be27363247..be27363247 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Files.java b/src/java/org/apache/poi/hssf/record/formula/functions/Files.java
index 156fc67012..156fc67012 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Files.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Files.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FinanceFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/FinanceFunction.java
index c054c6dac4..c054c6dac4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FinanceFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/FinanceFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FinanceLib.java b/src/java/org/apache/poi/hssf/record/formula/functions/FinanceLib.java
index 96f8717a2c..96f8717a2c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FinanceLib.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/FinanceLib.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Find.java b/src/java/org/apache/poi/hssf/record/formula/functions/Find.java
index 7bd11ecf34..7bd11ecf34 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Find.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Find.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Findb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Findb.java
index e722f74da1..e722f74da1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Findb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Findb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Finv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Finv.java
index 3ebb914bcd..3ebb914bcd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Finv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Finv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fisher.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fisher.java
index 8d2fba2585..8d2fba2585 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fisher.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fisher.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fisherinv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fisherinv.java
index 9f5167c9f7..9f5167c9f7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fisherinv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fisherinv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fixed.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fixed.java
index e5e5dc6377..e5e5dc6377 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fixed.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fixed.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Floor.java b/src/java/org/apache/poi/hssf/record/formula/functions/Floor.java
index 8698ce9f23..8698ce9f23 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Floor.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Floor.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Forecast.java b/src/java/org/apache/poi/hssf/record/formula/functions/Forecast.java
index 5fb4095038..5fb4095038 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Forecast.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Forecast.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Formulaconvert.java b/src/java/org/apache/poi/hssf/record/formula/functions/Formulaconvert.java
index 32b3a7beba..32b3a7beba 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Formulaconvert.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Formulaconvert.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fpos.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fpos.java
index 6e0b66fbf8..6e0b66fbf8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fpos.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fpos.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FreeRefFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/FreeRefFunction.java
index 56d285543e..56d285543e 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/FreeRefFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/FreeRefFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Frequency.java b/src/java/org/apache/poi/hssf/record/formula/functions/Frequency.java
index fc003c3e2e..fc003c3e2e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Frequency.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Frequency.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ftest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ftest.java
index fb662027ef..fb662027ef 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ftest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ftest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Function.java b/src/java/org/apache/poi/hssf/record/formula/functions/Function.java
index e33514a463..e33514a463 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Function.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Function.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Fv.java
index fd0335c388..fd0335c388 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Fv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Fv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammadist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Gammadist.java
index fa788c55e5..fa788c55e5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammadist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Gammadist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammainv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Gammainv.java
index ea8bdc53be..ea8bdc53be 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammainv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Gammainv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammaln.java b/src/java/org/apache/poi/hssf/record/formula/functions/Gammaln.java
index fb6026657a..fb6026657a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Gammaln.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Gammaln.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Geomean.java b/src/java/org/apache/poi/hssf/record/formula/functions/Geomean.java
index 1669a78901..1669a78901 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Geomean.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Geomean.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Goto.java b/src/java/org/apache/poi/hssf/record/formula/functions/Goto.java
index c1a4d596da..c1a4d596da 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Goto.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Goto.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Group.java b/src/java/org/apache/poi/hssf/record/formula/functions/Group.java
index 91c6cc5d18..91c6cc5d18 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Group.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Group.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Growth.java b/src/java/org/apache/poi/hssf/record/formula/functions/Growth.java
index 5a35a2b24b..5a35a2b24b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Growth.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Growth.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Halt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Halt.java
index 74ce5761c6..74ce5761c6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Halt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Halt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Harmean.java b/src/java/org/apache/poi/hssf/record/formula/functions/Harmean.java
index ade3109a1b..ade3109a1b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Harmean.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Harmean.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Help.java b/src/java/org/apache/poi/hssf/record/formula/functions/Help.java
index 1bf4004ac1..1bf4004ac1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Help.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Help.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hlookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java
index 40ed1da490..40ed1da490 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hlookup.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hour.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hour.java
index 0caeda4d8c..0caeda4d8c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hour.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hour.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hyperlink.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java
index 020d40d87f..020d40d87f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hyperlink.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hypgeomdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Hypgeomdist.java
index 9c76cc148a..9c76cc148a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Hypgeomdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Hypgeomdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/If.java b/src/java/org/apache/poi/hssf/record/formula/functions/If.java
index 7aba5db72a..7aba5db72a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/If.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/If.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Index.java b/src/java/org/apache/poi/hssf/record/formula/functions/Index.java
index aebf6aab0d..aebf6aab0d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Index.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Index.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Indirect.java b/src/java/org/apache/poi/hssf/record/formula/functions/Indirect.java
index 935e7cdbbd..935e7cdbbd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Indirect.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Indirect.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Info.java b/src/java/org/apache/poi/hssf/record/formula/functions/Info.java
index 2b542dd717..2b542dd717 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Info.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Info.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Initiate.java b/src/java/org/apache/poi/hssf/record/formula/functions/Initiate.java
index 6795c7aeb1..6795c7aeb1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Initiate.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Initiate.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Input.java b/src/java/org/apache/poi/hssf/record/formula/functions/Input.java
index 0d3614c796..0d3614c796 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Input.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Input.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Int.java b/src/java/org/apache/poi/hssf/record/formula/functions/Int.java
index 5b26a8a8a1..5b26a8a8a1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Int.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Int.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Intercept.java b/src/java/org/apache/poi/hssf/record/formula/functions/Intercept.java
index bf94b5ba29..bf94b5ba29 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Intercept.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Intercept.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ipmt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ipmt.java
index 61e85a4d5b..61e85a4d5b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ipmt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ipmt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Irr.java b/src/java/org/apache/poi/hssf/record/formula/functions/Irr.java
index f23325e4f9..f23325e4f9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Irr.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Irr.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/IsError.java b/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java
index 786060704e..786060704e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/IsError.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/IsError.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/IsNa.java b/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java
index b1f8f09641..b1f8f09641 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/IsNa.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isblank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java
index c0e482e5a8..c0e482e5a8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isblank.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Iserr.java b/src/java/org/apache/poi/hssf/record/formula/functions/Iserr.java
index f1ebd48fbd..f1ebd48fbd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Iserr.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Iserr.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Islogical.java b/src/java/org/apache/poi/hssf/record/formula/functions/Islogical.java
index 318d1e69f1..318d1e69f1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Islogical.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Islogical.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isnontext.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isnontext.java
index eb07e63eb8..eb07e63eb8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isnontext.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isnontext.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isnumber.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isnumber.java
index e3ff8d49aa..e3ff8d49aa 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isnumber.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isnumber.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ispmt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ispmt.java
index 69c7f428c3..69c7f428c3 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ispmt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ispmt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java
index 1deb606544..1deb606544 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Isref.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Isref.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Istext.java b/src/java/org/apache/poi/hssf/record/formula/functions/Istext.java
index ec87d79cbd..ec87d79cbd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Istext.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Istext.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Kurt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Kurt.java
index fe4e76eef5..fe4e76eef5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Kurt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Kurt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Large.java b/src/java/org/apache/poi/hssf/record/formula/functions/Large.java
index 3b9aed9768..3b9aed9768 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Large.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Large.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lasterror.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lasterror.java
index c5024a5ad3..c5024a5ad3 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lasterror.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lasterror.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Left.java b/src/java/org/apache/poi/hssf/record/formula/functions/Left.java
index ecb14a7008..ecb14a7008 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Left.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Left.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Leftb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Leftb.java
index 9c3d362970..9c3d362970 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Leftb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Leftb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Len.java b/src/java/org/apache/poi/hssf/record/formula/functions/Len.java
index 0bc49b4070..0bc49b4070 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Len.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Len.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lenb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lenb.java
index b47105aa13..b47105aa13 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lenb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lenb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Linest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Linest.java
index ea415a40c1..ea415a40c1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Linest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Linest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Links.java b/src/java/org/apache/poi/hssf/record/formula/functions/Links.java
index 1f2d570204..1f2d570204 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Links.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Links.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ln.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ln.java
index 95392a4d17..95392a4d17 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ln.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ln.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Log.java b/src/java/org/apache/poi/hssf/record/formula/functions/Log.java
index 7727c35275..7727c35275 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Log.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Log.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Log10.java b/src/java/org/apache/poi/hssf/record/formula/functions/Log10.java
index cf8b9bd138..cf8b9bd138 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Log10.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Log10.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Logest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Logest.java
index 2a36f7dad2..2a36f7dad2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Logest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Logest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java
index 03756e1faf..03756e1faf 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Loginv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Loginv.java
index 8b885ca506..8b885ca506 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Loginv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Loginv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lognormdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lognormdist.java
index 26ca53baec..26ca53baec 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lognormdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lognormdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java
index be1d0d0f94..be1d0d0f94 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lookup.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/LookupUtils.java b/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java
index d6a8489623..d6a8489623 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/LookupUtils.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lower.java b/src/java/org/apache/poi/hssf/record/formula/functions/Lower.java
index edf7e279ea..edf7e279ea 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Lower.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Lower.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Match.java b/src/java/org/apache/poi/hssf/record/formula/functions/Match.java
index a2a12cdba8..a2a12cdba8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Match.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Match.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/MathX.java b/src/java/org/apache/poi/hssf/record/formula/functions/MathX.java
index 593998f1e9..593998f1e9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/MathX.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/MathX.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Max.java b/src/java/org/apache/poi/hssf/record/formula/functions/Max.java
index d5b3971494..d5b3971494 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Max.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Max.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Maxa.java b/src/java/org/apache/poi/hssf/record/formula/functions/Maxa.java
index e25db7b746..e25db7b746 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Maxa.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Maxa.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mdeterm.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mdeterm.java
index ab57658c6d..ab57658c6d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mdeterm.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mdeterm.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Median.java b/src/java/org/apache/poi/hssf/record/formula/functions/Median.java
index 57a18b3314..57a18b3314 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Median.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Median.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mid.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mid.java
index 7f30aa4cec..7f30aa4cec 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mid.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mid.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Midb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Midb.java
index 2a06e4e09a..2a06e4e09a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Midb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Midb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Min.java b/src/java/org/apache/poi/hssf/record/formula/functions/Min.java
index 8cd896783c..8cd896783c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Min.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Min.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mina.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mina.java
index 21ba47b569..21ba47b569 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mina.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mina.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Minute.java b/src/java/org/apache/poi/hssf/record/formula/functions/Minute.java
index a8b6836208..a8b6836208 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Minute.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Minute.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Minverse.java b/src/java/org/apache/poi/hssf/record/formula/functions/Minverse.java
index 66f5647b7e..66f5647b7e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Minverse.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Minverse.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mirr.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mirr.java
index c87d11307d..c87d11307d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mirr.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mirr.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mmult.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mmult.java
index 95a4bf2f70..95a4bf2f70 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mmult.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mmult.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mod.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mod.java
index ebef231544..ebef231544 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mod.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mod.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mode.java b/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java
index 724b6e6543..724b6e6543 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Mode.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Mode.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Month.java b/src/java/org/apache/poi/hssf/record/formula/functions/Month.java
index d5178b22df..d5178b22df 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Month.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Month.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java
index 0e7cce217e..0e7cce217e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/N.java b/src/java/org/apache/poi/hssf/record/formula/functions/N.java
index a5e65c334a..a5e65c334a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/N.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/N.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Na.java b/src/java/org/apache/poi/hssf/record/formula/functions/Na.java
index eef0f45130..eef0f45130 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Na.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Na.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Names.java b/src/java/org/apache/poi/hssf/record/formula/functions/Names.java
index 476156a6f6..476156a6f6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Names.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Names.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Negbinomdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Negbinomdist.java
index 0eb494bc2b..0eb494bc2b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Negbinomdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Negbinomdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Normdist.java
index 3daca07365..3daca07365 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Normdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Norminv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Norminv.java
index 4a5948245c..4a5948245c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Norminv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Norminv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normsdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Normsdist.java
index 84d8aca881..84d8aca881 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normsdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Normsdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normsinv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Normsinv.java
index 161da9bde5..161da9bde5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Normsinv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Normsinv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Not.java b/src/java/org/apache/poi/hssf/record/formula/functions/Not.java
index 7ce39d6c71..7ce39d6c71 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Not.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Not.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java
index 49ed84fb46..49ed84fb46 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Note.java b/src/java/org/apache/poi/hssf/record/formula/functions/Note.java
index 210770ad71..210770ad71 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Note.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Note.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Now.java b/src/java/org/apache/poi/hssf/record/formula/functions/Now.java
index 2c23a97b37..2c23a97b37 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Now.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Now.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Nper.java b/src/java/org/apache/poi/hssf/record/formula/functions/Nper.java
index 95411edb77..95411edb77 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Nper.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Nper.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Npv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Npv.java
index 9e57999d76..9e57999d76 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Npv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Npv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Numberstring.java b/src/java/org/apache/poi/hssf/record/formula/functions/Numberstring.java
index 51403415cd..51403415cd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Numberstring.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Numberstring.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/NumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java
index fd96f1495a..fd96f1495a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/NumericFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Odd.java b/src/java/org/apache/poi/hssf/record/formula/functions/Odd.java
index 8af68c3db5..8af68c3db5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Odd.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Odd.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Offset.java b/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java
index 9497a5f21a..9497a5f21a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Offset.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Offset.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Or.java b/src/java/org/apache/poi/hssf/record/formula/functions/Or.java
index 22d7003d4d..22d7003d4d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Or.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Or.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pearson.java b/src/java/org/apache/poi/hssf/record/formula/functions/Pearson.java
index dda597a259..dda597a259 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pearson.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Pearson.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Percentile.java b/src/java/org/apache/poi/hssf/record/formula/functions/Percentile.java
index a3f59f1a8e..a3f59f1a8e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Percentile.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Percentile.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Percentrank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Percentrank.java
index a47e4ff13a..a47e4ff13a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Percentrank.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Percentrank.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Permut.java b/src/java/org/apache/poi/hssf/record/formula/functions/Permut.java
index e896f70f08..e896f70f08 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Permut.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Permut.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pi.java b/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java
index 0713dc7ed6..0713dc7ed6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pi.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Pi.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pmt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Pmt.java
index 58628053c0..58628053c0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pmt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Pmt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Poisson.java b/src/java/org/apache/poi/hssf/record/formula/functions/Poisson.java
index f4aba4c7f1..f4aba4c7f1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Poisson.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Poisson.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Power.java b/src/java/org/apache/poi/hssf/record/formula/functions/Power.java
index 1327e80061..1327e80061 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Power.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Power.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ppmt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ppmt.java
index 4e36630b94..4e36630b94 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ppmt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ppmt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Prob.java b/src/java/org/apache/poi/hssf/record/formula/functions/Prob.java
index 12293687f1..12293687f1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Prob.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Prob.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Product.java b/src/java/org/apache/poi/hssf/record/formula/functions/Product.java
index a88a3245d6..a88a3245d6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Product.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Product.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Proper.java b/src/java/org/apache/poi/hssf/record/formula/functions/Proper.java
index 26a8c3a90a..26a8c3a90a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Proper.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Proper.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Pv.java
index 1d54bee93d..1d54bee93d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Pv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Pv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Quartile.java b/src/java/org/apache/poi/hssf/record/formula/functions/Quartile.java
index ec81094f1f..ec81094f1f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Quartile.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Quartile.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Radians.java b/src/java/org/apache/poi/hssf/record/formula/functions/Radians.java
index 836fab3ad1..836fab3ad1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Radians.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Radians.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rand.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java
index 4c180383d8..4c180383d8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rand.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rand.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rank.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rank.java
index 2bb13d3fec..2bb13d3fec 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rank.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rank.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rate.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rate.java
index 485920c751..485920c751 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rate.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rate.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Reftext.java b/src/java/org/apache/poi/hssf/record/formula/functions/Reftext.java
index 3ba7bc988a..3ba7bc988a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Reftext.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Reftext.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Relref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Relref.java
index 7e7bee8df8..7e7bee8df8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Relref.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Relref.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Replace.java b/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java
index 95413f0823..95413f0823 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Replace.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Replace.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Replaceb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Replaceb.java
index 93d05bf083..93d05bf083 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Replaceb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Replaceb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rept.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rept.java
index ce56e70d9d..ce56e70d9d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rept.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rept.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Request.java b/src/java/org/apache/poi/hssf/record/formula/functions/Request.java
index 23eeea5ce0..23eeea5ce0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Request.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Request.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Result.java b/src/java/org/apache/poi/hssf/record/formula/functions/Result.java
index c15f2421e1..c15f2421e1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Result.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Result.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Right.java b/src/java/org/apache/poi/hssf/record/formula/functions/Right.java
index 771d045734..771d045734 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Right.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Right.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rightb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rightb.java
index 4ee99fdf04..4ee99fdf04 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rightb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rightb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Roman.java b/src/java/org/apache/poi/hssf/record/formula/functions/Roman.java
index c2db7e86c6..c2db7e86c6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Roman.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Roman.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Round.java b/src/java/org/apache/poi/hssf/record/formula/functions/Round.java
index db4f1db0ee..db4f1db0ee 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Round.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Round.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rounddown.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rounddown.java
index 13522294fd..13522294fd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rounddown.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rounddown.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Roundup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Roundup.java
index 4dae76d981..4dae76d981 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Roundup.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Roundup.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Row.java b/src/java/org/apache/poi/hssf/record/formula/functions/Row.java
index d111d594b5..d111d594b5 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Row.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Row.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rows.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java
index aabffab2f6..aabffab2f6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rows.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rows.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rsq.java b/src/java/org/apache/poi/hssf/record/formula/functions/Rsq.java
index f1addc391f..f1addc391f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Rsq.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Rsq.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Search.java b/src/java/org/apache/poi/hssf/record/formula/functions/Search.java
index 351495c6ce..351495c6ce 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Search.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Search.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Searchb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Searchb.java
index 3dfa711ab6..3dfa711ab6 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Searchb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Searchb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Second.java b/src/java/org/apache/poi/hssf/record/formula/functions/Second.java
index 3ebd5534a7..3ebd5534a7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Second.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Second.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Series.java b/src/java/org/apache/poi/hssf/record/formula/functions/Series.java
index 3e60685936..3e60685936 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Series.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Series.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Setname.java b/src/java/org/apache/poi/hssf/record/formula/functions/Setname.java
index 5f01782027..5f01782027 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Setname.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Setname.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Setvalue.java b/src/java/org/apache/poi/hssf/record/formula/functions/Setvalue.java
index c86e65e80c..c86e65e80c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Setvalue.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Setvalue.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sign.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sign.java
index 2353cf47f9..2353cf47f9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sign.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sign.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sin.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sin.java
index 1e7669302e..1e7669302e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sin.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sin.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sinh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sinh.java
index 8b03502865..8b03502865 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sinh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sinh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Skew.java b/src/java/org/apache/poi/hssf/record/formula/functions/Skew.java
index bb6d259fb0..bb6d259fb0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Skew.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Skew.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sln.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sln.java
index dfb81768c4..dfb81768c4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sln.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sln.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Slope.java b/src/java/org/apache/poi/hssf/record/formula/functions/Slope.java
index fb631f5649..fb631f5649 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Slope.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Slope.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Small.java b/src/java/org/apache/poi/hssf/record/formula/functions/Small.java
index 9fcdc1045e..9fcdc1045e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Small.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Small.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sqrt.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sqrt.java
index 57ce5cf48d..57ce5cf48d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sqrt.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sqrt.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Standardize.java b/src/java/org/apache/poi/hssf/record/formula/functions/Standardize.java
index 6fa1df51cf..6fa1df51cf 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Standardize.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Standardize.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/StatsLib.java b/src/java/org/apache/poi/hssf/record/formula/functions/StatsLib.java
index 8ebccfd950..8ebccfd950 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/StatsLib.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/StatsLib.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdev.java b/src/java/org/apache/poi/hssf/record/formula/functions/Stdev.java
index 7995e66c34..7995e66c34 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdev.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Stdev.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdeva.java b/src/java/org/apache/poi/hssf/record/formula/functions/Stdeva.java
index 50306a2d69..50306a2d69 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdeva.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Stdeva.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdevp.java b/src/java/org/apache/poi/hssf/record/formula/functions/Stdevp.java
index c270c3c7f9..c270c3c7f9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdevp.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Stdevp.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdevpa.java b/src/java/org/apache/poi/hssf/record/formula/functions/Stdevpa.java
index 2554b22014..2554b22014 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Stdevpa.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Stdevpa.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Step.java b/src/java/org/apache/poi/hssf/record/formula/functions/Step.java
index 3febcca471..3febcca471 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Step.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Step.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Steyx.java b/src/java/org/apache/poi/hssf/record/formula/functions/Steyx.java
index d92f3ef405..d92f3ef405 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Steyx.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Steyx.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Substitute.java b/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java
index 9d2e9ce361..9d2e9ce361 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Substitute.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Subtotal.java b/src/java/org/apache/poi/hssf/record/formula/functions/Subtotal.java
index ddfa3ad12a..ddfa3ad12a 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Subtotal.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Subtotal.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sum.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sum.java
index d3dcd9b202..d3dcd9b202 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sum.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sum.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumif.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java
index 11cb02315e..11cb02315e 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumif.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumproduct.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java
index 9f6eafa4dc..9f6eafa4dc 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumproduct.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumsq.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumsq.java
index b74b4161ac..b74b4161ac 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumsq.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumsq.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumx2my2.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumx2my2.java
index 30ad5ec230..30ad5ec230 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumx2my2.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumx2my2.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumx2py2.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumx2py2.java
index dfd730d12c..dfd730d12c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumx2py2.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumx2py2.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumxmy2.java b/src/java/org/apache/poi/hssf/record/formula/functions/Sumxmy2.java
index a1b2fec9b2..a1b2fec9b2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Sumxmy2.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Sumxmy2.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Syd.java b/src/java/org/apache/poi/hssf/record/formula/functions/Syd.java
index 45347f2d51..45347f2d51 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Syd.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Syd.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/T.java b/src/java/org/apache/poi/hssf/record/formula/functions/T.java
index b322cd985c..b322cd985c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/T.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/T.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tan.java b/src/java/org/apache/poi/hssf/record/formula/functions/Tan.java
index c8d1e33e5c..c8d1e33e5c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tan.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Tan.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tanh.java b/src/java/org/apache/poi/hssf/record/formula/functions/Tanh.java
index 1cb0e4fa2c..1cb0e4fa2c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tanh.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Tanh.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tdist.java b/src/java/org/apache/poi/hssf/record/formula/functions/Tdist.java
index d2a76de2eb..d2a76de2eb 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tdist.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Tdist.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Text.java b/src/java/org/apache/poi/hssf/record/formula/functions/Text.java
index 833fa82d00..833fa82d00 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Text.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Text.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/TextFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java
index 9da1776127..9da1776127 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/TextFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Textref.java b/src/java/org/apache/poi/hssf/record/formula/functions/Textref.java
index 8fa2514f68..8fa2514f68 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Textref.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Textref.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Time.java b/src/java/org/apache/poi/hssf/record/formula/functions/Time.java
index 2b85da168b..2b85da168b 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Time.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Time.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Timevalue.java b/src/java/org/apache/poi/hssf/record/formula/functions/Timevalue.java
index 049bd30ff0..049bd30ff0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Timevalue.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Timevalue.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tinv.java b/src/java/org/apache/poi/hssf/record/formula/functions/Tinv.java
index dab7dcd0e0..dab7dcd0e0 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Tinv.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Tinv.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Today.java b/src/java/org/apache/poi/hssf/record/formula/functions/Today.java
index 6260d20a58..6260d20a58 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Today.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Today.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Transpose.java b/src/java/org/apache/poi/hssf/record/formula/functions/Transpose.java
index cd414ff1c8..cd414ff1c8 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Transpose.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Transpose.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trend.java b/src/java/org/apache/poi/hssf/record/formula/functions/Trend.java
index 80cece928c..80cece928c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trend.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Trend.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trim.java b/src/java/org/apache/poi/hssf/record/formula/functions/Trim.java
index 87e29ee34d..87e29ee34d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trim.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Trim.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trimmean.java b/src/java/org/apache/poi/hssf/record/formula/functions/Trimmean.java
index 4775a9ee90..4775a9ee90 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trimmean.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Trimmean.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/True.java b/src/java/org/apache/poi/hssf/record/formula/functions/True.java
index 78df7776a1..78df7776a1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/True.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/True.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trunc.java b/src/java/org/apache/poi/hssf/record/formula/functions/Trunc.java
index 65fedd126d..65fedd126d 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Trunc.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Trunc.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ttest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ttest.java
index b453043c13..b453043c13 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ttest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ttest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Type.java b/src/java/org/apache/poi/hssf/record/formula/functions/Type.java
index 423038211f..423038211f 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Type.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Type.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Upper.java b/src/java/org/apache/poi/hssf/record/formula/functions/Upper.java
index 5146a6641c..5146a6641c 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Upper.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Upper.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Usdollar.java b/src/java/org/apache/poi/hssf/record/formula/functions/Usdollar.java
index 3baf71c9b3..3baf71c9b3 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Usdollar.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Usdollar.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Value.java b/src/java/org/apache/poi/hssf/record/formula/functions/Value.java
index 6772dcf283..6772dcf283 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Value.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Value.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Var.java b/src/java/org/apache/poi/hssf/record/formula/functions/Var.java
index 2b0a3b67c7..2b0a3b67c7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Var.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Var.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vara.java b/src/java/org/apache/poi/hssf/record/formula/functions/Vara.java
index c484c5a9ea..c484c5a9ea 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vara.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Vara.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Varp.java b/src/java/org/apache/poi/hssf/record/formula/functions/Varp.java
index e8c8bd30dc..e8c8bd30dc 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Varp.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Varp.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Varpa.java b/src/java/org/apache/poi/hssf/record/formula/functions/Varpa.java
index 290b97de89..290b97de89 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Varpa.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Varpa.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vdb.java b/src/java/org/apache/poi/hssf/record/formula/functions/Vdb.java
index 5fb594d6ee..5fb594d6ee 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vdb.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Vdb.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vlookup.java b/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java
index 7d27491df1..7d27491df1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Vlookup.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Volatile.java b/src/java/org/apache/poi/hssf/record/formula/functions/Volatile.java
index 734eb0fbe7..734eb0fbe7 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Volatile.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Volatile.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Weekday.java b/src/java/org/apache/poi/hssf/record/formula/functions/Weekday.java
index 7de5f952b3..7de5f952b3 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Weekday.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Weekday.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Weibull.java b/src/java/org/apache/poi/hssf/record/formula/functions/Weibull.java
index b2a4895fad..b2a4895fad 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Weibull.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Weibull.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java
index b989c33a26..b989c33a26 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Year.java b/src/java/org/apache/poi/hssf/record/formula/functions/Year.java
index b461a09668..b461a09668 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Year.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Year.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ztest.java b/src/java/org/apache/poi/hssf/record/formula/functions/Ztest.java
index ed12b63328..ed12b63328 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/Ztest.java
+++ b/src/java/org/apache/poi/hssf/record/formula/functions/Ztest.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/EvaluationCycleDetector.java b/src/java/org/apache/poi/hssf/usermodel/EvaluationCycleDetector.java
index 90f5807ff5..90f5807ff5 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/EvaluationCycleDetector.java
+++ b/src/java/org/apache/poi/hssf/usermodel/EvaluationCycleDetector.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/EvaluationCycleDetectorManager.java b/src/java/org/apache/poi/hssf/usermodel/EvaluationCycleDetectorManager.java
index a06cd201e2..a06cd201e2 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/EvaluationCycleDetectorManager.java
+++ b/src/java/org/apache/poi/hssf/usermodel/EvaluationCycleDetectorManager.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
index bb16fdfadd..bb16fdfadd 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/OperationEvaluatorFactory.java b/src/java/org/apache/poi/hssf/usermodel/OperationEvaluatorFactory.java
index 1292009699..1292009699 100755
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/OperationEvaluatorFactory.java
+++ b/src/java/org/apache/poi/hssf/usermodel/OperationEvaluatorFactory.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/model/TestFormulaParserSP.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
index 0141e1b2a4..7419734535 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/model/TestFormulaParserSP.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
@@ -33,10 +33,10 @@ import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator.CellValue;
 
 /**
  * Test the low level formula parser functionality,
- *  but using parts which need to use the
- *  HSSFFormulaEvaluator, which is in scratchpad 
+ *  but using parts which need to use 
+ *  HSSFFormulaEvaluator.
  */
-public final class TestFormulaParserSP extends TestCase {
+public final class TestFormulaParserEval extends TestCase {
 
 	public void testWithNamedRange() throws Exception {
 		HSSFWorkbook workbook = new HSSFWorkbook();
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java
index 5098c789a7..5098c789a7 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java
index 72db658f77..72db658f77 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java
index 27e3338652..27e3338652 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java
index 617f5d0d4e..617f5d0d4e 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java
index 2d5408c76a..2d5408c76a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java
index be8cef13fa..be8cef13fa 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java
index 724c54cd90..724c54cd90 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java
index ef5b3add07..ef5b3add07 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
index 66d2a1d270..66d2a1d270 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java
index a6e262b868..a6e262b868 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java
index d477231349..d477231349 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java
index 4f0e5fff2c..4f0e5fff2c 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java
index ae93a2d41b..ae93a2d41b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java
index 2c5e152ab8..2c5e152ab8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java
index 4dfe1fbb52..4dfe1fbb52 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java
index 902c4122ef..902c4122ef 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java
index 7ce2bd245b..7ce2bd245b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java
index a96fb4e2b0..a96fb4e2b0 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java
index 071ca0f7d8..071ca0f7d8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java
index d275e5f333..d275e5f333 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java
index eb576506a0..eb576506a0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java
index dc3d595aed..dc3d595aed 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java
index f114662985..f114662985 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java
index 935615acae..935615acae 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java
index a6ce345aeb..a6ce345aeb 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java
index 4002c30d0f..4002c30d0f 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java
index 237366baf0..237366baf0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java
index 73043911f4..73043911f4 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java
index 4d63cad1c5..4d63cad1c5 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java
index 076ac1fc7e..076ac1fc7e 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java
index c9f043bd3b..c9f043bd3b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
index c849fd4369..c849fd4369 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestBug43093.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBug43093.java
index ce072e9e01..ce072e9e01 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestBug43093.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBug43093.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
index 87a760f714..87a760f714 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
index 6c2e3b6412..6c2e3b6412 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java