Author: fanningpj
Date: Thu Feb 3 12:24:59 2022
New Revision: 1897723
URL: http://svn.apache.org/viewvc?rev=1897723&view=rev
Log:
[bug-62857] support locale
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java?rev=1897723&r1=1897722&r2=1897723&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
Thu Feb 3 12:24:59 2022
@@ -180,6 +180,7 @@ public final class TestFormulaEvaluatorO
Cell c = formulasRow.getCell(colnum);
assumeTrue(c != null);
assumeTrue(c.getCellType() == CellType.FORMULA);
+ assumeFalse(targetFunctionName.equalsIgnoreCase("DOLLAR"));
ignoredFormulaTestCase(c.getCellFormula());
CellValue actValue = evaluator.evaluate(c);
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java?rev=1897723&r1=1897722&r2=1897723&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
Thu Feb 3 12:24:59 2022
@@ -27,8 +27,6 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.util.Locale;
public abstract class NumericFunction implements Function {
@@ -113,8 +111,8 @@ public abstract class NumericFunction im
decimalPlacesFormat.append('0');
}
StringBuilder decimalFormatString = new StringBuilder();
- decimalFormatString.append("$#,##0").append(decimalPlacesFormat)
-
.append(";($#,##0").append(decimalPlacesFormat).append(')');
+ decimalFormatString.append("¤#,##0").append(decimalPlacesFormat)
+
.append(";(¤#,##0").append(decimalPlacesFormat).append(')');
DecimalFormatSymbols symbols =
DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale());
DecimalFormat df = new
DecimalFormat(decimalFormatString.toString(), symbols);
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java?rev=1897723&r1=1897722&r2=1897723&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
Thu Feb 3 12:24:59 2022
@@ -19,8 +19,11 @@ package org.apache.poi.ss.formula.functi
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.util.LocaleUtil;
import org.junit.jupiter.api.Test;
+import java.util.Locale;
+
import static org.apache.poi.ss.util.Utils.assertDouble;
import static org.apache.poi.ss.util.Utils.assertString;
@@ -53,15 +56,63 @@ final class TestNumericFunction {
@Test
void testDOLLAR() {
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
- HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
//https://support.microsoft.com/en-us/office/dollar-function-a6cd05d9-9740-4ad3-a469-8109d18ff611
- assertString(fe, cell, "DOLLAR(1234.567,2)", "$1,234.57");
- assertString(fe, cell, "DOLLAR(-1234.567,0)", "($1,235)");
- assertString(fe, cell, "DOLLAR(-1234.567,-2)", "($1,200)");
- assertString(fe, cell, "DOLLAR(-0.123,4)", "($0.1230)");
- assertString(fe, cell, "DOLLAR(99.888)", "$99.89");
- assertString(fe, cell, "DOLLAR(123456789.567,2)", "$123,456,789.57");
+ Locale defaultLocale = LocaleUtil.getUserLocale();
+ try {
+ LocaleUtil.setUserLocale(new Locale("en", "US"));
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+
//https://support.microsoft.com/en-us/office/dollar-function-a6cd05d9-9740-4ad3-a469-8109d18ff611
+ assertString(fe, cell, "DOLLAR(1234.567,2)", "$1,234.57");
+ assertString(fe, cell, "DOLLAR(-1234.567,0)", "($1,235)");
+ assertString(fe, cell, "DOLLAR(-1234.567,-2)", "($1,200)");
+ assertString(fe, cell, "DOLLAR(-0.123,4)", "($0.1230)");
+ assertString(fe, cell, "DOLLAR(99.888)", "$99.89");
+ assertString(fe, cell, "DOLLAR(123456789.567,2)",
"$123,456,789.57");
+ } finally {
+ LocaleUtil.setUserLocale(defaultLocale);
+ }
+ }
+
+ @Test
+ void testDOLLARIreland() {
+ Locale defaultLocale = LocaleUtil.getUserLocale();
+ try {
+ LocaleUtil.setUserLocale(new Locale("en", "IE"));
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ assertString(fe, cell, "DOLLAR(1234.567,2)", "â¬1,234.57");
+ } finally {
+ LocaleUtil.setUserLocale(defaultLocale);
+ }
+ }
+
+ @Test
+ void testDOLLARSpain() {
+ Locale defaultLocale = LocaleUtil.getUserLocale();
+ try {
+ LocaleUtil.setUserLocale(new Locale("es", "ES"));
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ assertString(fe, cell, "DOLLAR(1234.567,2)", "â¬1.234,57");
+ } finally {
+ LocaleUtil.setUserLocale(defaultLocale);
+ }
+ }
+
+ @Test
+ void testDOLLARJapan() {
+ Locale defaultLocale = LocaleUtil.getUserLocale();
+ try {
+ LocaleUtil.setUserLocale(new Locale("ja", "JP"));
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ assertString(fe, cell, "DOLLAR(1234.567,2)", "ï¿¥1,234.57");
+ } finally {
+ LocaleUtil.setUserLocale(defaultLocale);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
