From d154e853b271fd07c5b86323dbc01b66194e857b Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Thu, 13 Jan 2011 16:01:29 +0000 Subject: [PATCH] Bugfix: Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet (Excel5 Reader) git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@66848 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Reader/Excel5.php | 3 ++- changelog.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Reader/Excel5.php b/Classes/PHPExcel/Reader/Excel5.php index d2647743..4dba0205 100644 --- a/Classes/PHPExcel/Reader/Excel5.php +++ b/Classes/PHPExcel/Reader/Excel5.php @@ -3898,8 +3898,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader if (!is_null($this->getReadFilter())) { $includeCellRange = false; $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress); + $rangeBoundaries[1][0]++; for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; $row++) { - for ($column = $rangeBoundaries[0][0]; $column <= $rangeBoundaries[1][0]; $column++) { + for ($column = $rangeBoundaries[0][0]; $column != $rangeBoundaries[1][0]; $column++) { if ($this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle())) { $includeCellRange = true; break 2; diff --git a/changelog.txt b/changelog.txt index 1655ec68..fb3cfc8e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -44,6 +44,7 @@ Fixed in SVN: - Bugfix: (MBaker) Work item 13374 - file that makes cells go black - Bugfix: (MBaker) Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute - Bugfix: (MBaker) Work item 15089 - PHPExcel_Worksheet->toArray() index problem +- Bugfix: (MBaker) Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet - General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.