From 8cd6f56fdd8fcf50c6351399ab5f32bb5e97bb2f Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Mon, 30 Dec 2013 22:19:05 +0000 Subject: [PATCH] Bugfix: (Jazzo) Work Item GH-248 - Excel2007 does not correctly mark rows as hidden --- Classes/PHPExcel/Reader/Excel2007.php | 6 +++--- changelog.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Reader/Excel2007.php b/Classes/PHPExcel/Reader/Excel2007.php index 74322a18..893a097c 100644 --- a/Classes/PHPExcel/Reader/Excel2007.php +++ b/Classes/PHPExcel/Reader/Excel2007.php @@ -762,7 +762,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE if (isset($xmlSheet->cols) && !$this->_readDataOnly) { foreach ($xmlSheet->cols->col as $col) { - for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) { + for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) { if ($col["style"] && !$this->_readDataOnly) { $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"])); } @@ -2057,9 +2057,9 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE private static function boolean($value = NULL) { - if (is_numeric($value)) { + if (is_numeric($value) || is_object($value)) { return (bool) $value; - } + } return ($value === 'true' || $value === 'TRUE') ? TRUE : FALSE; } } diff --git a/changelog.txt b/changelog.txt index 9c884142..4a1d922f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -42,6 +42,7 @@ Fixed in develop branch for release v1.8.0: - Bugfix: (MBaker) Work Item GH-275 - Insert New Row/Column Before is not correctly updating formula references - Bugfix: (MBaker) Work Item GH-257 - Passing an array of cells to _generateRow() in the HTML/PDF Writer causes caching problems with last cell in the range - Bugfix: (MBaker) Work Item GH-193 - Fix to empty worksheet garbage collection when using cell caching +- Bugfix: (Jazzo) Work Item GH-248 - Excel2007 does not correctly mark rows as hidden - Feature: (amerov) - Implementation of the Excel HLOOKUP() function - Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) - Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer