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

Bugfix: Work item 15786 - RangeToArray strange array keys

Browse Source 
and Minor performance tweak to the workbook setActiveSheetIndexByName() method


git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@72435 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-04-28 20:42:50 +00:00
parent 5672f25ebf
commit 5979a4ec13
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel.php
View File

@ -379,7 +379,7 @@ class PHPExcel
public function setActiveSheetIndexByName($pValue = '') public function setActiveSheetIndexByName($pValue = '')
{ {
if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) { if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
$this->setActiveSheetIndex($worksheet->getParent()->getIndex($worksheet)); $this->setActiveSheetIndex($this->getIndex($worksheet));
return $worksheet; return $worksheet;
} }
@ -396,7 +396,7 @@ class PHPExcel
$returnValue = array(); $returnValue = array();
$worksheetCount = $this->getSheetCount(); $worksheetCount = $this->getSheetCount();
for ($i = 0; $i < $worksheetCount; ++$i) { for ($i = 0; $i < $worksheetCount; ++$i) {
array_push($returnValue, $this->getSheet($i)->getTitle()); $returnValue[] = $this->getSheet($i)->getTitle();
} }
return $returnValue; return $returnValue;

3
Classes/PHPExcel/Worksheet.php
View File

@ -2176,11 +2176,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$maxCol++; $maxCol++;
// Loop through rows // Loop through rows
$r = -1;
for ($row = $minRow; $row <= $maxRow; ++$row) { for ($row = $minRow; $row <= $maxRow; ++$row) {
$rRef = ($returnCellRef) ? $row : ++$r;
$c = -1; $c = -1;
// Loop through columns in the current row // Loop through columns in the current row
for ($col = $minCol; $col != $maxCol; ++$col) { for ($col = $minCol; $col != $maxCol; ++$col) {
$rRef = ($returnCellRef) ? $row : $row-1;
$cRef = ($returnCellRef) ? $col : ++$c; $cRef = ($returnCellRef) ? $col : ++$c;
// Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen // Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
// so we test and retrieve directly against _cellCollection // so we test and retrieve directly against _cellCollection

1
changelog.txt
View File

@ -31,6 +31,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Work item 15537 - Excel2007 Reader canRead function bug - Bugfix: (MBaker) Work item 15537 - Excel2007 Reader canRead function bug
- Bugfix: (MBaker) Support for Excel functions whose return can be used as either a value or as a cell reference depending on its context within a formula - Bugfix: (MBaker) Support for Excel functions whose return can be used as either a value or as a cell reference depending on its context within a formula
- Bugfix: (gilles06) Work item 15707 - ini_set() call in Calculation class destructor - Bugfix: (gilles06) Work item 15707 - ini_set() call in Calculation class destructor
- Bugfix: (MBaker) Work item 15786 - RangeToArray strange array keys
- General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC) - General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
- General: (MBaker) Work item 15461 - Locale file paths not fit for windows - General: (MBaker) Work item 15461 - Locale file paths not fit for windows