From 4669ec9f5dad0bcd81c8a2b41439be2e283f0fd9 Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Sat, 26 Sep 2009 10:41:01 +0000
Subject: [PATCH] fixed XSSFCell.getStringCellValue() to properly handle cached
 formula results

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@819106 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/status.xml    |   1 +
 .../apache/poi/xssf/usermodel/XSSFCell.java   |  16 +++--
 .../poi/xssf/usermodel/TestXSSFCell.java      |  61 ++++++++++++++++++
 test-data/spreadsheet/47889.xlsx              | Bin 0 -> 3555 bytes
 4 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 test-data/spreadsheet/47889.xlsx

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index d44bc902ad..446790656c 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,6 +33,7 @@
 
     <changes>
         <release version="3.6-beta1" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">47889 - fixed XSSFCell.getStringCellValue() to properly handle cached formula results</action>
         </release>
         <release version="3.5-FINAL" date="2009-09-28">
            <action dev="POI-DEVELOPERS" type="fix">47747 - fixed logic for locating shared formula records</action>
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 e76f22a97b..aee0405b2f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
@@ -249,6 +249,9 @@ public final class XSSFCell implements Cell {
                     } else {
                         rt = new XSSFRichTextString("");
                     }
+                } else if (_cell.getT() == STCellType.STR) {
+                    //cached formula value
+                    rt = new XSSFRichTextString(_cell.isSetV() ? _cell.getV() : "");
                 } else {
                     if (_cell.isSetV()) {
                         int idx = Integer.parseInt(_cell.getV());
@@ -411,12 +414,15 @@ public final class XSSFCell implements Cell {
     /**
      * Return the cell's style.
      *
-     * @return the cell's style. Always not-null. Default cell style has zero index and can be obtained as
-     * <code>workbook.getCellStyleAt(0)</code>
+     * @return the cell's style.</code>
      */
     public XSSFCellStyle getCellStyle() {
-        long idx = _cell.isSetS() ? _cell.getS() : 0;
-        return _stylesSource.getStyleAt((int)idx);
+        XSSFCellStyle style = null;
+        if(_stylesSource.getNumCellStyles() > 0){
+            long idx = _cell.isSetS() ? _cell.getS() : 0;
+            style = _stylesSource.getStyleAt((int)idx);
+        }
+        return style;
     }
 
     /**
@@ -629,7 +635,7 @@ public final class XSSFCell implements Cell {
     private void setBlank(){
         CTCell blank = CTCell.Factory.newInstance();
         blank.setR(_cell.getR());
-        blank.setS(_cell.getS());
+        if(_cell.isSetS()) blank.setS(_cell.getS());
         _cell.set(blank);
     }
 
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 194a983e25..e097bfd140 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
@@ -21,6 +21,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.XSSFITestDataProvider;
 import org.apache.poi.xssf.model.SharedStringsTable;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
 
 /**
  * @author Yegor Kozlov
@@ -105,4 +106,64 @@ public final class TestXSSFCell extends BaseTestCell {
         assertEquals(0, sst.getCount());
         assertEquals(XSSFCell.CELL_TYPE_BLANK, cell_1.getCellType());
     }
+
+    public void testFormulaString() {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+        CTCell ctCell = cell.getCTCell(); //low-level bean holding cell's xml
+
+        cell.setCellFormula("A2");
+        assertEquals(XSSFCell.CELL_TYPE_FORMULA, cell.getCellType());
+        //the value is not set and cell's type='N' which means blank
+        assertEquals(STCellType.N, ctCell.getT());
+
+        //set cached formula value
+        cell.setCellValue("t='str'");
+        //we are still of 'formula' type
+        assertEquals(XSSFCell.CELL_TYPE_FORMULA, cell.getCellType());
+        //cached formula value is set and cell's type='STR'
+        assertEquals(STCellType.STR, ctCell.getT());
+        assertEquals("t='str'", cell.getStringCellValue());
+
+        //now remove the formula, the cached formula result remains
+        cell.setCellFormula(null);
+        assertEquals(XSSFCell.CELL_TYPE_STRING, cell.getCellType());
+        assertEquals(STCellType.STR, ctCell.getT());
+        //the line below failed prior to fix of Bug #47889
+        assertEquals("t='str'", cell.getStringCellValue());
+
+        //revert to a blank cell
+        cell.setCellValue((String)null);
+        assertEquals(XSSFCell.CELL_TYPE_BLANK, cell.getCellType());
+        assertEquals(STCellType.N, ctCell.getT());
+        assertEquals("", cell.getStringCellValue());
+    }
+
+    /**
+     * Bug 47889: problems when calling XSSFCell.getStringCellValue() on a workbook created in Gnumeric
+     */
+    public void test47889() {
+        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("47889.xlsx");
+        XSSFSheet sh = wb.getSheetAt(0);
+
+        XSSFCell cell;
+
+        //try a string cell
+        cell = sh.getRow(0).getCell(0);
+        assertEquals(XSSFCell.CELL_TYPE_STRING, cell.getCellType());
+        assertEquals("a", cell.getStringCellValue());
+        assertEquals("a", cell.toString());
+        //Gnumeric produces spreadsheets without styles
+        //make sure we return null for that instead of throwing OutOfBounds
+        assertEquals(null, cell.getCellStyle());
+
+        //try a numeric cell
+        cell = sh.getRow(1).getCell(0);
+        assertEquals(XSSFCell.CELL_TYPE_NUMERIC, cell.getCellType());
+        assertEquals(1.0, cell.getNumericCellValue());
+        assertEquals("1.0", cell.toString());
+        //Gnumeric produces spreadsheets without styles
+        //make sure we return null for that instead of throwing OutOfBounds
+        assertEquals(null, cell.getCellStyle());
+    }
 }
diff --git a/test-data/spreadsheet/47889.xlsx b/test-data/spreadsheet/47889.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d4b23abc2163c18e5fb154dc2393b8d6708a4324
GIT binary patch
literal 3555
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
V*ie^-928)GJI6#$b>sfqe+QXex_bZs

literal 0
HcmV?d00001

-- 
2.39.5