Use the same "is this a formula" logic for both getCellType and getCachedFormulaResul...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1693767 13f79535-47bb-0310-9956-ffa450edef68

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 5c16f05e8b96fb10cccbeb5795b80bbdda787588..bb57f65c6e1e74981ab5047414b237da5f353af0 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
@@ -536,6 +536,13 @@ public final class XSSFCell implements Cell {
             _cell.setS(idx);
         }
     }
+    
+    private boolean isFormulaCell() {
+        if (_cell.getF() != null || getSheet().isCellInArrayFormulaContext(this)) {
+            return true;
+        }
+        return false;
+    }
 
     /**
      * Return the cell type.
@@ -550,10 +557,7 @@ public final class XSSFCell implements Cell {
      */
     @Override
     public int getCellType() {
-
-        if (_cell.getF() != null || getSheet().isCellInArrayFormulaContext(this)) {
-            return CELL_TYPE_FORMULA;
-        }
+        if (isFormulaCell()) return CELL_TYPE_FORMULA;
 
         return getBaseCellType(true);
     }
@@ -566,7 +570,7 @@ public final class XSSFCell implements Cell {
      */
     @Override
     public int getCachedFormulaResultType() {
-        if (_cell.getF() == null) {
+        if (! isFormulaCell()) {
             throw new IllegalStateException("Only formula cells have cached results");
         }