Bugfix: (ncrypthic) Work Item GH-570 - Ignore inlineStr type if formu…

…la element exists
PHPOffice · May 24, 2015 · 1ba2ae0 · 1ba2ae0
1 parent 99b3756
commit 1ba2ae0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Classes/PHPExcel/Calculation/LookupRef.php b/Classes/PHPExcel/Calculation/LookupRef.php
@@ -694,7 +694,7 @@ public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not
     {
         $lookup_value    = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
         $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
         if ($index_number < 1) {

diff --git a/Classes/PHPExcel/Reader/Excel2007.php b/Classes/PHPExcel/Reader/Excel2007.php
@@ -848,8 +848,12 @@ public function load($pFilename)
                                                 }
                                                 break;
                                             case "inlineStr":
-    //                                            echo 'Inline String', PHP_EOL;
-                                                $value = $this->parseRichText($c->is);
+//                                                echo 'Inline String', PHP_EOL;
+                                                if (isset($c->f)) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                } else {
+                                                    $value = $this->parseRichText($c->is);
+                                                }
                                                 break;
                                             case "e":
     //                                            echo 'Error', PHP_EOL;
@@ -862,7 +866,7 @@ public function load($pFilename)
                                                 }
                                                 break;
                                             default:
-    //                                            echo 'Default', PHP_EOL;
+//                                                echo 'Default', PHP_EOL;
                                                 if (!isset($c->f)) {
     //                                                echo 'Not a Formula', PHP_EOL;
                                                     $value = self::castToString($c);

diff --git a/changelog.txt b/changelog.txt
@@ -25,6 +25,7 @@
 
 Planned for 1.8.2
 - 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):