Author: fanningpj
Date: Thu Dec 30 21:18:26 2021
New Revision: 1896546
URL: http://svn.apache.org/viewvc?rev=1896546&view=rev
Log:
excelant evaluator if seems useless
Modified:
poi/trunk/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
Modified:
poi/trunk/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java?rev=1896546&r1=1896545&r2=1896546&view=diff
==============================================================================
---
poi/trunk/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
(original)
+++
poi/trunk/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
Thu Dec 30 21:18:26 2021
@@ -164,21 +164,22 @@ public class ExcelAntWorkbookUtil extend
*/
protected FormulaEvaluator getEvaluator(String fileName) {
FormulaEvaluator evaluator;
- if (fileName.endsWith(".xlsx")) {
- if(xlsMacroList.size() > 0) {
+ if (!fileName.endsWith(".xlsx")) {
+ if(xlsMacroList.isEmpty()) {
+ evaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook);
+ } else {
evaluator = XSSFFormulaEvaluator.create((XSSFWorkbook)
workbook,
null,
getFunctions());
}
- evaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook);
} else {
- if(xlsMacroList.size() > 0) {
+ if(xlsMacroList.isEmpty()) {
+ evaluator = new HSSFFormulaEvaluator((HSSFWorkbook) workbook);
+ } else {
evaluator = HSSFFormulaEvaluator.create((HSSFWorkbook)workbook,
null,
getFunctions());
}
-
- evaluator = new HSSFFormulaEvaluator((HSSFWorkbook) workbook);
}
return evaluator;
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java?rev=1896546&r1=1896545&r2=1896546&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
Thu Dec 30 21:18:26 2021
@@ -81,7 +81,7 @@ public class CellNumberPartHandler imple
case '/':
//!! This assumes there is a numerator and a denominator, but
these are actually optional
- if (slash == null && specials.size() > 0) {
+ if (slash == null && !specials.isEmpty()) {
numerator = previousNumber();
// If the first number in the whole format is the numerator,
the
// entire number should be printed as an improper fraction
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
