diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index 939ab4926..b79dac650 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -37,6 +37,7 @@ + 47206 - Fixed XSSFCell to properly read inline strings 47250 - Fixed FontRecord to expect unicode flags even when name length is zero 47198 - Fixed formula evaluator comparison of -0.0 and 0.0 47229 - Fixed ExternalNameRecord to handle DDE links diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 481dce9d5..568963351 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 47206 - Fixed XSSFCell to properly read inline strings 47250 - Fixed FontRecord to expect unicode flags even when name length is zero 47198 - Fixed formula evaluator comparison of -0.0 and 0.0 47229 - Fixed ExternalNameRecord to handle DDE links diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java index 314303743..63a3d8081 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java @@ -242,14 +242,24 @@ public final class XSSFCell implements Cell { rt = new XSSFRichTextString(""); break; case CELL_TYPE_STRING: - if (!cell.isSetV()) rt = new XSSFRichTextString(""); - else { - if (cell.getT() == STCellType.INLINE_STR) { - return new XSSFRichTextString(cell.getV()); + if (cell.getT() == STCellType.INLINE_STR) { + if(cell.isSetIs()) { + //string is expressed directly in the cell definition instead of implementing the shared string table. + rt = new XSSFRichTextString(cell.getIs()); + } else if (cell.isSetV()) { + //cached result of a formula + rt = new XSSFRichTextString(cell.getV()); } else { + rt = new XSSFRichTextString(""); + } + } else { + if (cell.isSetV()) { int idx = Integer.parseInt(cell.getV()); rt = new XSSFRichTextString(sharedStringSource.getEntryAt(idx)); } + else { + rt = new XSSFRichTextString(""); + } } break; case CELL_TYPE_FORMULA: diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java index f97a6d1b8..40a937b11 100755 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java @@ -19,6 +19,7 @@ package org.apache.poi.xssf.usermodel; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.XSSFITestDataProvider; +import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType; /** * @author Yegor Kozlov @@ -50,4 +51,32 @@ public final class TestXSSFCell extends BaseTestCell { cell.setCellFormula(null); cell.setCellValue("456"); } + + /** + * Test that we can read inline strings that are expressed directly in the cell definition + * instead of implementing the shared string table. + * + * Some programs, for example, Microsoft Excel Driver for .xlsx insert inline string + * instead of using the shared string table. See bug 47206 + */ + public void testInlineString() throws Exception { + XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("xlsx-jdbc.xlsx"); + XSSFSheet sheet = wb.getSheetAt(0); + XSSFRow row = sheet.getRow(1); + + XSSFCell cell_0 = row.getCell(0); + assertEquals(STCellType.INT_INLINE_STR, cell_0.getCTCell().getT().intValue()); + assertTrue(cell_0.getCTCell().isSetIs()); + assertEquals("A Very large string in column 1 AAAAAAAAAAAAAAAAAAAAA", cell_0.getStringCellValue()); + + XSSFCell cell_1 = row.getCell(1); + assertEquals(STCellType.INT_INLINE_STR, cell_1.getCTCell().getT().intValue()); + assertTrue(cell_1.getCTCell().isSetIs()); + assertEquals("foo", cell_1.getStringCellValue()); + + XSSFCell cell_2 = row.getCell(2); + assertEquals(STCellType.INT_INLINE_STR, cell_2.getCTCell().getT().intValue()); + assertTrue(cell_2.getCTCell().isSetIs()); + assertEquals("bar", row.getCell(2).getStringCellValue()); + } } \ No newline at end of file diff --git a/src/testcases/org/apache/poi/hssf/data/xlsx-jdbc.xlsx b/src/testcases/org/apache/poi/hssf/data/xlsx-jdbc.xlsx new file mode 100755 index 000000000..d9823b428 Binary files /dev/null and b/src/testcases/org/apache/poi/hssf/data/xlsx-jdbc.xlsx differ