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

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

This commit is contained in:
Progi1984 2016-03-22 16:11:20 +01:00
parent 54ae9901f5 fcaf73e77f
commit 86bfdcba15
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -31,6 +31,7 @@ Planned for 1.9
- Feature: (MBaker) - Initial implementation of SUMIFS() function - Feature: (MBaker) - Initial implementation of SUMIFS() function
- Feature: (MBaker) - Additional codepages - Feature: (MBaker) - Additional codepages
- Feature: (Tomino2112) Work Item GH-808 - MemoryDrawing not working in HTML writer - 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): 2015-04-30 (v1.8.1):

5
src/PhpSpreadsheet/Reader/Excel2007.php
View File

@ -1043,8 +1043,9 @@ class Excel2007 extends BaseReader implements IReader
} }
// Extract all cell references in $ref // Extract all cell references in $ref
foreach (\PHPExcel\Cell::extractAllCellReferencesInRange($ref) as $reference) { $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));
$docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles); foreach ($cellBlocks as $cellBlock) {
$docSheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);
} }
} }
} }