RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-22 21:36:05 +03:00
Code Issues Projects Releases Wiki Activity

Bugfix: Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet (Excel5 Reader)

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@66848 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-01-13 16:01:29 +00:00
parent 9f252c9e80
commit d154e853b2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Classes/PHPExcel/Reader/Excel5.php
View File

@ -3898,8 +3898,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
if (!is_null($this->getReadFilter())) { if (!is_null($this->getReadFilter())) {
$includeCellRange = false; $includeCellRange = false;
$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress); $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress);
$rangeBoundaries[1][0]++;
for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; $row++) { 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())) { if ($this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle())) {
$includeCellRange = true; $includeCellRange = true;
break 2; break 2;

1
changelog.txt
View File

@ -44,6 +44,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Work item 13374 - file that makes cells go black - 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) 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 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. - General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.