General: (rentalhost) Work Item GH-575 - Excel 2007 Reader freezes because of conditional formatting

MarkBaker · MarkBaker · commit 7fa160905bec · 2016-03-22T13:35:28.000Z
diff --git a/Classes/PHPExcel/Reader/Excel2007.php b/Classes/PHPExcel/Reader/Excel2007.php
@@ -960,8 +960,9 @@ public function load($pFilename)
                                     }
 
                                     // Extract all cell references in $ref
-                                    foreach (PHPExcel_Cell::extractAllCellReferencesInRange($ref) as $reference) {
-                                        $docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles);
+                                    $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));
+                                    foreach ($cellBlocks as $cellBlock) {
+                                        $docSheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);
                                     }
                                 }
                             }
diff --git a/changelog.txt b/changelog.txt
@@ -32,6 +32,7 @@ Planned for 1.8.2
 - Feature:  (MBaker)                            - Initial implementation of SUMIFS() function
 - Feature:  (MBaker)                            - Additional codepages
 - Feature:  (Tomino2112)      Work Item GH-808  - MemoryDrawing not working in HTML writer
+- General:  (rentalhost)      Work Item GH-575  - Excel 2007 Reader freezes because of conditional formatting
 
 
 2015-04-30 (v1.8.1):

Original file line number	Diff line number	Diff line change
`@@ -960,8 +960,9 @@ public function load($pFilename)`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`// Extract all cell references in $ref`
`963`		`- foreach (PHPExcel_Cell::extractAllCellReferencesInRange($ref) as $reference) {`
`964`		`- $docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles);`
	`963`	`+ $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));`
	`964`	`+ foreach ($cellBlocks as $cellBlock) {`
	`965`	`+ $docSheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);`
`965`	`966`	`}`
`966`	`967`	`}`
`967`	`968`	`}`