Browse Source

Bug 55926: Handle numeric formula values when exporting to XML

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1564028 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_3_11_BETA1
Dominik Stadler 10 years ago
parent
commit
9b16c77233

+ 10
- 1
src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java View File

import javax.xml.validation.Validator; import javax.xml.validation.Validator;


import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFMap; import org.apache.poi.xssf.usermodel.XSSFMap;
case XSSFCell.CELL_TYPE_STRING: value = cell.getStringCellValue(); break; case XSSFCell.CELL_TYPE_STRING: value = cell.getStringCellValue(); break;
case XSSFCell.CELL_TYPE_BOOLEAN: value += cell.getBooleanCellValue(); break; case XSSFCell.CELL_TYPE_BOOLEAN: value += cell.getBooleanCellValue(); break;
case XSSFCell.CELL_TYPE_ERROR: value = cell.getErrorCellString(); break; case XSSFCell.CELL_TYPE_ERROR: value = cell.getErrorCellString(); break;
case XSSFCell.CELL_TYPE_FORMULA: value = cell.getStringCellValue(); break;
case XSSFCell.CELL_TYPE_FORMULA:
if (cell.getCachedFormulaResultType() == Cell.CELL_TYPE_STRING) {
value = cell.getStringCellValue();
} else {
value += cell.getNumericCellValue();
}
break;
case XSSFCell.CELL_TYPE_NUMERIC: case XSSFCell.CELL_TYPE_NUMERIC:
if (DateUtil.isCellDateFormatted(cell)) { if (DateUtil.isCellDateFormatted(cell)) {
DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
value += cell.getRawValue(); value += cell.getRawValue();
} }
break; break;

default: ; default: ;


} }

+ 31
- 0
src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java View File

assertEquals("2012-01-13", date); assertEquals("2012-01-13", date);
} }
} }

public void testFormulaCells_Bugzilla_55926() throws Exception {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55926.xlsx");

for (POIXMLDocumentPart p : wb.getRelations()) {

if (!(p instanceof MapInfo)) {
continue;
}
MapInfo mapInfo = (MapInfo) p;

XSSFMap map = mapInfo.getXSSFMapById(1);

assertNotNull("XSSFMap is null", map);

XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os, true);
String xmlData = os.toString("UTF-8");

assertNotNull(xmlData);
assertFalse(xmlData.equals(""));
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String doubleValue = a.split("<DOUBLE>")[1].split("</DOUBLE>")[0].trim();
String stringValue = a.split("<STRING>")[1].split("</STRING>")[0].trim();
assertEquals("Hello World", stringValue);
assertEquals("5.1", doubleValue);
}
}
} }

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


Loading…
Cancel
Save