nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update library PHPExcel to version 1.7.4

Browse Source
This commit is contained in:
Dieter Adriaenssens
2010-09-11 16:18:42 +02:00
parent f5879655d5
commit adaa35a87f
129 changed files with 1553 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/PHPExcel/PHPExcel/Worksheet.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version 1.7.3c, 2010-06-01
* @version 1.7.4, 2010-08-26
*/
@@ -2180,9 +2180,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$highestRow = 1;
// Find cells that can be cleaned
foreach ($this->_cellCollection->getCellList() as $coordinate) {
preg_match('/^(\w+)(\d+)$/U',$coordinate,$matches);
list(,$col,$row) = $matches;
foreach ($this->_cellCollection->getCellList() as $coord) {
list($col,$row) = sscanf($coord,'%[A-Z]%d');
$column = PHPExcel_Cell::columnIndexFromString($col);
// Determine highest column and row
@@ -2468,7 +2467,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
if (is_object($val) || (is_array($val))) {
$this->{$key} = unserialize(serialize($val));
if ($key == '_cellCollection') {
$newCollection = clone $this->_cellCollection;
$newCollection->copyCellCollection($this);
$this->_cellCollection = $newCollection;
} else {
$this->{$key} = unserialize(serialize($val));
}
}
}
}