alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

2
Classes/PHPExcel/Calculation/LookupRef.php
View File

@ -694,7 +694,7 @@ class PHPExcel_Calculation_LookupRef
{ {
$lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value); $lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
$index_number = PHPExcel_Calculation_Functions::flattenSingleValue($index_number); $index_number = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
$not_exact_match = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match); $not_exact_match = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
// index_number must be greater than or equal to 1 // index_number must be greater than or equal to 1
if ($index_number < 1) { if ($index_number < 1) {

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

@ -848,8 +848,12 @@ 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;
$value = $this->parseRichText($c->is); if (isset($c->f)) {
$this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
} else {
$value = $this->parseRichText($c->is);
}
break; break;
case "e": case "e":
// echo 'Error', PHP_EOL; // echo 'Error', PHP_EOL;
@ -862,7 +866,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
} }
break; break;
default: default:
// echo 'Default', PHP_EOL; // echo 'Default', PHP_EOL;
if (!isset($c->f)) { if (!isset($c->f)) {
// echo 'Not a Formula', PHP_EOL; // echo 'Not a Formula', PHP_EOL;
$value = self::castToString($c); $value = self::castToString($c);

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):