mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-24 09:09:22 +00:00
Minor performance tweaks and adjustments to Excel functions to handle a few envelope test cases
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@85742 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
@@ -421,7 +421,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
||||
// Re-order cell collection
|
||||
return $this->sortCellCollection();
|
||||
}
|
||||
if (!is_null($this->_cellCollection)) {
|
||||
if ($this->_cellCollection !== NULL) {
|
||||
return $this->_cellCollection->getCellList();
|
||||
}
|
||||
return array();
|
||||
@@ -434,7 +434,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
||||
*/
|
||||
public function sortCellCollection()
|
||||
{
|
||||
if (!is_null($this->_cellCollection)) {
|
||||
if ($this->_cellCollection !== NULL) {
|
||||
return $this->_cellCollection->getSortedCellList();
|
||||
}
|
||||
return array();
|
||||
@@ -984,7 +984,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
||||
if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
|
||||
(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
|
||||
$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
|
||||
if (!is_null($namedRange)) {
|
||||
if ($namedRange !== NULL) {
|
||||
$pCoordinate = $namedRange->getRange();
|
||||
return $namedRange->getWorksheet()->getCell($pCoordinate);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user