Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated patch from Marc from #55927 - handle date formulas too 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1614696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-07-30 16:10:56 +00:00
parent 8eb7e4a7f4
commit 6dd3e805e7
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
View File

@ -293,14 +293,17 @@ public class XSSFExportToXml implements Comparator<String>{
if (cell.getCachedFormulaResultType() == Cell.CELL_TYPE_STRING) {
value = cell.getStringCellValue();
} else {
value += cell.getNumericCellValue();
if (DateUtil.isCellDateFormatted(cell)) {
value = getFormattedDate(cell);
} else {
value += cell.getNumericCellValue();
}
}
break;
case XSSFCell.CELL_TYPE_NUMERIC:
if (DateUtil.isCellDateFormatted(cell)) {
DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
value += sdf.format(cell.getDateCellValue());
value = getFormattedDate(cell);
} else {
value += cell.getRawValue();
}
@ -321,7 +324,10 @@ public class XSSFExportToXml implements Comparator<String>{
return elementName.matches(".*:.*")?elementName.split(":")[1]:elementName;
}
private String getFormattedDate(XSSFCell cell) {
DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(cell.getDateCellValue());
}
private Node getNodeByXPath(String xpath,Node rootNode,Document doc,boolean createMultipleInstances) {
String[] xpathTokens = xpath.split("/");

4
src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
View File

@ -279,8 +279,8 @@ public final class TestXSSFExportToXML extends TestCase {
assertNotNull(xmlData);
assertFalse(xmlData.equals(""));
String date = xmlData.split("<DATE>")[1].split("</DATE>")[0].trim();
assertEquals("2012-01-13", date);
assertEquals("2012-01-13", xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
assertEquals("2012-02-16", xmlData.split("<FORMULA_DATE>")[1].split("</FORMULA_DATE>")[0].trim());
parseXML(xmlData);

BIN
test-data/spreadsheet/55927.xlsx
View File

Binary file not shown.