RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-26 07:16:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #397 from goncons/develop

Browse Source 
Open Document cell with not numeric formula
This commit is contained in:
Mark Baker 2014-07-14 23:01:13 +01:00
commit 0e14e41299
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Classes/PHPExcel/Writer/OpenDocument/Content.php
View File

@ -205,12 +205,16 @@ class PHPExcel_Writer_OpenDocument_Content extends PHPExcel_Writer_OpenDocument_
case PHPExcel_Cell_DataType::TYPE_FORMULA: case PHPExcel_Cell_DataType::TYPE_FORMULA:
try { try {
$formula_value = PHPExcel_Calculation::getInstance()->calculateCellValue($cell); $formula_value = $cell->getCalculatedValue();
} catch (Exception $e) { } catch (Exception $e) {
$formula_value = $cell->getValue(); $formula_value = $cell->getValue();
} }
$objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue()); $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue());
$objWriter->writeAttribute('office:value-type', 'float'); if (is_numeric($formula_value)) {
$objWriter->writeAttribute('office:value-type', 'float');
} else {
$objWriter->writeAttribute('office:value-type', 'string');
}
$objWriter->writeAttribute('office:value', $formula_value); $objWriter->writeAttribute('office:value', $formula_value);
$objWriter->writeElement('text:p', $formula_value); $objWriter->writeElement('text:p', $formula_value);
break; break;