Merge remote-tracking branch 'origin/1.9' into 1.9

changelog.txt

@@ -31,6 +31,7 @@ Planned for 1.9
 - 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):

src/PhpSpreadsheet/Reader/Excel2007.php

@@ -1043,8 +1043,9 @@ class Excel2007 extends BaseReader implements IReader
                                     }
 
                                     // 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);
                                     }
                                 }
                             }