From 9f252c9e806cd221c9315bb2dd80adf9bf883793 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Wed, 12 Jan 2011 16:48:54 +0000 Subject: [PATCH] Bugfix: Work item 15089 - PHPExcel_Worksheet->toArray() index problem git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@66807 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Worksheet.php | 2 +- changelog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php index 7e61c7f4..b1397502 100644 --- a/Classes/PHPExcel/Worksheet.php +++ b/Classes/PHPExcel/Worksheet.php @@ -2182,7 +2182,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable if ($formatData) { $style = $this->_parent->getCellXfByIndex($cell->getXfIndex()); - $returnValue[$row][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString($returnValue[$rRef][$cRef], $style->getNumberFormat()->getFormatCode()); + $returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString($returnValue[$rRef][$cRef], $style->getNumberFormat()->getFormatCode()); } } else { // Cell doesn't exist diff --git a/changelog.txt b/changelog.txt index 82fcafb6..1655ec68 100644 --- a/changelog.txt +++ b/changelog.txt @@ -43,6 +43,7 @@ Fixed in SVN: - Bugfix: (MBaker) Work item 14029 - Excel 2007 Reader /writer lost fontcolor - 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 - General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.