purged usages of Cell.setCellType (left only in tests, where conversions are tested)

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

5 files changed, 5 insertions, 18 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
index 46f01eb850..25af5f6935 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
@@ -36,7 +36,7 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.FormulaError;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ooxml.util.DocumentHelper;
@@ -526,14 +526,12 @@ public final class TestXSSFExportToXML {
        
        Cell cString = row.createCell(0);
        cString.setCellValue("somestring");
-       cString.setCellType(CellType.STRING);
-       
+
        Cell cBoolean = row.createCell(1);
        cBoolean.setCellValue(true);
-       cBoolean.setCellType(CellType.BOOLEAN);
-       
+
        Cell cError = row.createCell(2);
-       cError.setCellType(CellType.ERROR);
+       cError.setCellErrorValue(FormulaError.NUM.getCode());
        
        Cell cFormulaString = row.createCell(3);
        cFormulaString.setCellFormula("A1");
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
index 79d805b6ef..3aee0c54c9 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
@@ -30,7 +30,6 @@ import java.util.Date;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.PrintSetup;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -136,10 +135,8 @@ public final class TestSXSSFBugs extends BaseTestBugzillaIssues {
         Row row = sheet.createRow(rowIndex++);
 
         Cell cell = row.createCell(colIndex++);
-        cell.setCellType(CellType.STRING);
         cell.setCellValue("multiple");
         cell = row.createCell(colIndex);
-        cell.setCellType(CellType.STRING);
         cell.setCellValue("unique");
 
         writeRow(sheet, rowIndex++, 80d, "INDEX(A2:A7, MATCH(FALSE, ISBLANK(A2:A7), 0))");
@@ -166,7 +163,6 @@ public final class TestSXSSFBugs extends BaseTestBugzillaIssues {
 
         // numeric value cell
         Cell cell = row.createCell(colIndex++);
-        cell.setCellType(CellType.NUMERIC);
         cell.setCellValue(col0Value);
 
         // formula value cell
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 99d95e1b5b..bdc9b6ddc8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -629,7 +629,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
         sheet.getRow(3).getCell(0).setCellFormula("14"); // stay
         XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
 
-        sheet.getRow(4).getCell(0).setCellType(CellType.STRING); // go
+        sheet.getRow(4).getCell(0).setBlank(); // go
         XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
 
         validateCells(sheet);
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 6e83a5e6e2..993e2c9b21 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
@@ -71,7 +71,6 @@ public final class TestXSSFCell extends BaseTestXCell {
         Sheet sheet = wb.getSheetAt(0);
         Row row = sheet.getRow(0);
         Cell cell = row.getCell(0);
-        cell.setCellType(CellType.STRING);
         cell.setCellValue("456");
         wb.close();
     }
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
index 06d7866f8a..0394f6fdd2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
@@ -26,7 +26,6 @@ import org.apache.poi.ss.formula.DataValidationEvaluator;
 import org.apache.poi.ss.formula.eval.ValueEval;
 import org.apache.poi.ss.usermodel.BaseTestDataValidation;
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
 import org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType;
@@ -142,9 +141,6 @@ public class TestXSSFDataValidation extends BaseTestDataValidation {
                 Cell cell_22 = i==0 && j < 2 ? (row2 == null ? null : row2.createCell(2)) : null;
 
                 Cell cell_13 = row1.createCell(3);
-
-
-                cell_13.setCellType(CellType.NUMERIC);
                 cell_13.setCellValue(validationType==ValidationType.DECIMAL ? dvalue.doubleValue() : value.intValue());
 
 
@@ -210,11 +206,9 @@ public class TestXSSFDataValidation extends BaseTestDataValidation {
 
 
                 String value1String = validationType==ValidationType.DECIMAL ? dvalue.toString() : value.toString();
-                cell_13.setCellType(CellType.NUMERIC);
                 cell_13.setCellValue(validationType==ValidationType.DECIMAL ? dvalue.doubleValue() : value.intValue());
 
                 String value2String = validationType==ValidationType.DECIMAL ? dvalue2.toString() : value2.toString();
-                cell_14.setCellType(CellType.NUMERIC);
                 cell_14.setCellValue(validationType==ValidationType.DECIMAL ? dvalue2.doubleValue() : value2.intValue());