Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[github-321] Fix issue with rounding in DataFormatter. Thanks to Colin Wang. This closes #321 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1899680 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-04-09 12:02:55 +00:00
parent 7289015073
commit a8f1e7acd1
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
View File

@ -1406,9 +1406,11 @@ public final class TestXSSFWorkbook extends BaseTestXWorkbook {
DataFormatter dataFormatter = new DataFormatter(); DataFormatter dataFormatter = new DataFormatter();
FormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator(); FormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
XSSFCell a3 = xssfSheet.getRow(2).getCell(0); XSSFCell a3 = xssfSheet.getRow(2).getCell(0);
assertEquals(2.05, a3.getNumericCellValue());
assertEquals("2.05", dataFormatter.formatCellValue(a3)); assertEquals("2.05", dataFormatter.formatCellValue(a3));
assertEquals("2.05", dataFormatter.formatCellValue(a3, formulaEvaluator)); assertEquals("2.05", dataFormatter.formatCellValue(a3, formulaEvaluator));
XSSFCell a4 = xssfSheet.getRow(3).getCell(0); XSSFCell a4 = xssfSheet.getRow(3).getCell(0);
assertEquals(2.05, a4.getNumericCellValue());
assertEquals("2.1", dataFormatter.formatCellValue(a4)); assertEquals("2.1", dataFormatter.formatCellValue(a4));
assertEquals("2.1", dataFormatter.formatCellValue(a4, formulaEvaluator)); assertEquals("2.1", dataFormatter.formatCellValue(a4, formulaEvaluator));
} }

8
poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
View File

@ -51,7 +51,7 @@ import org.apache.poi.util.LocaleUtil;
/** /**
* DataFormatter contains methods for formatting the value stored in an * DataFormatter contains methods for formatting the value stored in a
* Cell. This can be useful for reports and GUI presentations when you * Cell. This can be useful for reports and GUI presentations when you
* need to display data exactly as it appears in Excel. Supported formats * need to display data exactly as it appears in Excel. Supported formats
* include currency, SSN, percentages, decimals, dates, phone numbers, zip * include currency, SSN, percentages, decimals, dates, phone numbers, zip
@ -139,7 +139,7 @@ public class DataFormatter {
private static final Pattern localePatternGroup = Pattern.compile("(\\[\\$[^-\\]]*-[0-9A-Z]+])"); private static final Pattern localePatternGroup = Pattern.compile("(\\[\\$[^-\\]]*-[0-9A-Z]+])");
/** /**
* A regex to match the colour formattings rules. * A regex to match the colour formatting's rules.
* Allowed colours are: Black, Blue, Cyan, Green, * Allowed colours are: Black, Blue, Cyan, Green,
* Magenta, Red, White, Yellow, "Color n" (1<=n<=56) * Magenta, Red, White, Yellow, "Color n" (1<=n<=56)
*/ */
@ -948,9 +948,9 @@ public class DataFormatter {
Format numberFormat = getFormat(cell, cfEvaluator); Format numberFormat = getFormat(cell, cfEvaluator);
double d = cell.getNumericCellValue(); double d = cell.getNumericCellValue();
if (numberFormat == null) { if (numberFormat == null) {
return String.valueOf(d); return NumberToTextConverter.toText(d);
} }
String formatted = numberFormat.format(d); String formatted = numberFormat.format(new BigDecimal(NumberToTextConverter.toText(d)));
return formatted.replaceFirst("E(\\d)", "E+$1"); // to match Excel's E-notation return formatted.replaceFirst("E(\\d)", "E+$1"); // to match Excel's E-notation
} }

BIN
test-data/spreadsheet/github-321.xlsx
View File

Binary file not shown.