Bugfix: Work item 18844 - cache_in_memory_gzip "eats" last worksheet line, cache_in_memory doesn't

This commit is contained in:
Mark Baker 2012-11-09 01:24:44 +00:00
parent d2a6b4bc85
commit 1f601e0ecf
2 changed files with 3 additions and 2 deletions

View File

@ -2385,7 +2385,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
// Returnvalue
$returnValue = array();
// Identify the range that we need to extract from the worksheet
list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
$minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
@ -2394,7 +2393,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$maxRow = $rangeEnd[1];
$maxCol++;
// Loop through rows
$r = -1;
for ($row = $minRow; $row <= $maxRow; ++$row) {
@ -2503,6 +2501,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @return PHPExcel_Worksheet
*/
public function garbageCollect() {
// Flush cache
$this->_cellCollection->getCacheData('A1');
// Build a reference table from images
// $imageCoordinates = array();
// $iterator = $this->getDrawingCollection()->getIterator();

View File

@ -31,6 +31,7 @@ Fixed in develop branch:
- General: (kea) Work item GH-69 - Improved AdvancedValueBinder for currency
- Bugfix: (techhead) Work item GH-70 - Fixed formula/formatting bug when removing rows
- Bugfix: (alexgann) Work item GH-63 - Fix to cellExists for non-existent namedRanges
- Bugfix: (MBaker) Work item 18844 - cache_in_memory_gzip "eats" last worksheet line, cache_in_memory doesn't
--------------------------------------------------------------------------------