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

Bugfix: (ncrypthic) Work Item GH-570 - Ignore inlineStr type if formula element exists

Browse Source
This commit is contained in:
MarkBaker 2015-05-24 12:27:36 +01:00
parent 99b375613d
commit 1ba2ae0cec
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Reader/Excel2007.php
View File

@ -849,7 +849,11 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
break; break;
case "inlineStr": case "inlineStr":
// echo 'Inline String', PHP_EOL; // echo 'Inline String', PHP_EOL;
if (isset($c->f)) {
$this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
} else {
$value = $this->parseRichText($c->is); $value = $this->parseRichText($c->is);
}
break; break;
case "e": case "e":
// echo 'Error', PHP_EOL; // echo 'Error', PHP_EOL;

1
changelog.txt
View File

@ -25,6 +25,7 @@
Planned for 1.8.2 Planned for 1.8.2
- Bugfix: (MBaker) - Fix to getCell() method when cell reference includes a worksheet reference - Bugfix: (MBaker) - Fix to getCell() method when cell reference includes a worksheet reference
- Bugfix: (ncrypthic) Work Item GH-570 - Ignore inlineStr type if formula element exists
2015-04-30 (v1.8.1): 2015-04-30 (v1.8.1):