From 6ac11ae86c78aec003d998e512c863a4c53a926d Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Fri, 8 Oct 2010 08:26:57 +0000 Subject: [PATCH] allow overridden built-in formats in XSSFCellStyle, see Bugzilla 49928 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1005726 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/usermodel/XSSFDataFormat.java | 4 +- .../xssf/usermodel/TestXSSFDataFormat.java | 38 ++++++++++++++++++ test-data/spreadsheet/49928.xlsx | Bin 0 -> 7984 bytes 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 test-data/spreadsheet/49928.xlsx diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java index 6e78cf79b6..00ac90736a 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java @@ -51,8 +51,8 @@ public class XSSFDataFormat implements DataFormat { * @return string represented at index of format or null if there is not a format at that index */ public String getFormat(short index) { - String fmt = BuiltinFormats.getBuiltinFormat(index); - if(fmt == null) fmt = stylesSource.getNumberFormatAt(index); + String fmt = stylesSource.getNumberFormatAt(index); + if(fmt == null) fmt = BuiltinFormats.getBuiltinFormat(index); return fmt; } } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java index 963d0df2d2..3769ccf196 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java @@ -18,7 +18,10 @@ package org.apache.poi.xssf.usermodel; import org.apache.poi.ss.usermodel.BaseTestDataFormat; +import org.apache.poi.ss.usermodel.BuiltinFormats; +import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.xssf.XSSFITestDataProvider; +import org.apache.poi.xssf.XSSFTestDataSamples; /** * Tests for {@link XSSFDataFormat} @@ -28,4 +31,39 @@ public final class TestXSSFDataFormat extends BaseTestDataFormat { public TestXSSFDataFormat() { super(XSSFITestDataProvider.instance); } + + /** + * [Bug 49928] formatCellValue returns incorrect value for \u00a3 formatted cells + */ + public void test49928(){ + XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("49928.xlsx"); + DataFormatter df = new DataFormatter(); + + XSSFSheet sheet = wb.getSheetAt(0); + XSSFCell cell = sheet.getRow(0).getCell(0); + XSSFCellStyle style = cell.getCellStyle(); + + String poundFmt = "\"\u00a3\"#,##0;[Red]\\-\"\u00a3\"#,##0"; + // not expected normally, id of a custom format should be gerater + // than BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX + short poundFmtIdx = 6; + + assertEquals(poundFmt, style.getDataFormatString()); + assertEquals(poundFmtIdx, style.getDataFormat()); + assertEquals("\u00a31", df.formatCellValue(cell)); + + + XSSFDataFormat dataFormat = wb.createDataFormat(); + assertEquals(poundFmtIdx, dataFormat.getFormat(poundFmt)); + assertEquals(poundFmt, dataFormat.getFormat(poundFmtIdx)); + + // an attempt to register an existing format returns its index + assertEquals(poundFmtIdx, wb.getStylesSource().putNumberFormat(poundFmt)); + + // now create a custom format with Pound (\u00a3) + short customFmtIdx = dataFormat.getFormat("\u00a3##.00[Yellow]"); + assertTrue(customFmtIdx > BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX ); + assertEquals("\u00a3##.00[Yellow]", dataFormat.getFormat(customFmtIdx)); + + } } diff --git a/test-data/spreadsheet/49928.xlsx b/test-data/spreadsheet/49928.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..6a49ae3a7b263b522a81566fc7c751f7a1eab54f GIT binary patch literal 7984 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 literal 0 HcmV?d00001 -- 2.39.5