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

Update library PHPExcel to version 1.7.3c

Browse Source
This commit is contained in:
Dieter Adriaenssens
2010-06-03 20:35:06 +02:00
parent c676b181a5
commit b4d8e58a72
129 changed files with 256 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -81,7 +81,7 @@ $Id$
to Muhammad Adnan.
+ [doc] Incorporate synchronisation docs into main document.
+ [core] Include Content Security Policy HTTP headers.
- [core] Update library PHPExcel to version 1.7.3
- [core] Update library PHPExcel to version 1.7.3c
3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value

2
libraries/PHPExcel/PHPExcel.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Autoloader.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
class PHPExcel_Autoloader

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

23
libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -134,29 +134,20 @@ class PHPExcel_CachedObjectStorage_CacheBase {
/**
* Sort the list of all cell addresses currently held in cache by column and row
* Sort the list of all cell addresses currently held in cache by row and column
*
* @return void
*/
public function sortCellList() {
$sortValues = array();
public function getSortedCellList() {
$sortKeys = array();
foreach ($this->_cellCache as $coord => $value) {
preg_match('/^(\w+)(\d+)$/U',$coord,$matches);
list(,$colNum,$rowNum) = $matches;
$key = str_pad($rowNum . str_pad($colNum,3,'@',STR_PAD_LEFT),12,'0',STR_PAD_LEFT);
$sortValues[$key] = $coord;
$sortKeys[$coord] = str_pad($rowNum . str_pad($colNum,3,'@',STR_PAD_LEFT),12,'0',STR_PAD_LEFT);
}
ksort($sortValues);
asort($sortKeys);
// Rebuild cellCollection from the sorted index
$newCellCollection = array();
foreach ($sortValues as $coord) {
$newCellCollection[$coord] = $this->_cellCache[$coord];
}
$this->_cellCache = $newCellCollection;
return array_keys($sortKeys);
} // function sortCellList()
}

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

6
libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -88,10 +88,10 @@ interface PHPExcel_CachedObjectStorage_ICache
public function getCellList();
/**
* Sort the list of all cell addresses currently held in cache by column and row
* Get the list of all cell addresses currently held in cache sorted by column and row
*
* @return void
*/
public function sortCellList();
public function getSortedCellList();
}

9
libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -186,7 +186,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
// Set a new Memcache object and connect to the Memcache server
$this->_memcache = new Memcache();
if (!$this->_memcache->connect($memcacheServer, $memcachePort)) {
if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback')) {
throw new Exception('Could not connect to Memcache server at '.$memcacheServer.':'.$memcachePort);
}
$this->_cacheTime = $cacheTime;
@@ -196,6 +196,11 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
} // function __construct()
public function failureCallback($host, $port) {
throw new Exception('memcache '.$host.':'.$port' failed');
}
public function __destruct() {
$cacheList = $this->getCellList();
foreach($cacheList as $cellID) {

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_CachedObjectStorage
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

5
libraries/PHPExcel/PHPExcel/Calculation.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -3093,6 +3093,7 @@ class PHPExcel_Calculation {
if (!is_null($pCellParent)) {
if ($pCellParent->getParent()->getSheetByName($matches[2])->cellExists($cellRef)) {
$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($matches[2]), false);
$pCell->attach($pCellParent);
} else {
$cellValue = PHPExcel_Calculation_Functions::REF();
}
@@ -3106,6 +3107,7 @@ class PHPExcel_Calculation {
$this->_writeDebug('Evaluating Cell '.$cellRef.' in current worksheet');
if ($pCellParent->cellExists($cellRef)) {
$cellValue = $this->extractCellRange($cellRef, $pCellParent, false);
$pCell->attach($pCellParent);
} else {
$cellValue = NULL;
}
@@ -3228,6 +3230,7 @@ class PHPExcel_Calculation {
// echo 'Named Range is '.$namedRange.'<br />';
$this->_writeDebug('Evaluating Named Range '.$namedRange);
$cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellParent : null), false);
$pCell->attach($pCellParent);
$this->_writeDebug('Evaluation Result for named range '.$namedRange.' is '.self::_showTypeDetails($cellValue));
$stack->push('Named Range',$cellValue,$namedRange);
} else {

2
libraries/PHPExcel/PHPExcel/Calculation/Exception.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Calculation/Function.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

4
libraries/PHPExcel/PHPExcel/Calculation/Functions.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Calculation
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -5691,7 +5691,7 @@ class PHPExcel_Calculation_Functions {
* @return string Version information
*/
public static function VERSION() {
return 'PHPExcel 1.7.3, 2010-05-17';
return 'PHPExcel 1.7.3c, 2010-06-01';
} // function VERSION()

2
libraries/PHPExcel/PHPExcel/Cell.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/DataType.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/DataValidation.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Cell
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Comment.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/DocumentProperties.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/DocumentSecurity.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/HashTable.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/IComparable.php
View File

@@ -20,7 +20,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/IOFactory.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/NamedRange.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Reader/CSV.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

7
libraries/PHPExcel/PHPExcel/Reader/Excel2007.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -160,6 +160,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
*/
public function canRead($pFilename)
{
// Check if zip class exists
if (!class_exists('ZipArchive')) {
return false;
}
// Check if file exists
if (!file_exists($pFilename)) {
throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");

2
libraries/PHPExcel/PHPExcel/Reader/Excel5.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader_Excel5
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
// Original file header of ParseXL (used as the base for this class):

2
libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader_Excel5
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Reader/IReader.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

7
libraries/PHPExcel/PHPExcel/Reader/OOCalc.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -176,6 +176,11 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
*/
public function canRead($pFilename)
{
// Check if zip class exists
if (!class_exists('ZipArchive')) {
return false;
}
// Check if file exists
if (!file_exists($pFilename)) {
throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");

2
libraries/PHPExcel/PHPExcel/Reader/SYLK.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Reader/Serialized.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Reader
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/ReferenceHelper.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/RichText.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_RichText
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/RichText/ITextElement.php
View File

@@ -20,7 +20,7 @@
* @package PHPExcel_RichText
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/RichText/Run.php
View File

@@ -20,7 +20,7 @@
* @package PHPExcel_RichText
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/RichText/TextElement.php
View File

@@ -20,7 +20,7 @@
* @package PHPExcel_RichText
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Settings.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Settings
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/** PHPExcel root directory */

2
libraries/PHPExcel/PHPExcel/Shared/CodePage.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/Date.php
View File

@@ -23,7 +23,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/Drawing.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/Escher.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Escher
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/Excel5.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

2
libraries/PHPExcel/PHPExcel/Shared/File.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/Font.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_OLE
* @copyright Copyright (c) 2006 - 2007 Christian Schmidt
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version 1.7.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
/**

6
libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
View File

@@ -69,6 +69,12 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
if (is_resource($filename)) {
$this->_FILEH_ = $filename;
} else if ($filename == '-' || $filename == '') {
$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
if ($this->_FILEH_ == false) {
throw new Exception("Can't create temporary file.");
}
} else {
$this->_FILEH_ = fopen($filename, "wb");
}

5
libraries/PHPExcel/PHPExcel/Shared/OLERead.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
@@ -162,7 +162,6 @@ class PHPExcel_Shared_OLERead {
$this->entry = $this->_readData($block);
$this->_readPropertySets();
}
/**
@@ -323,7 +322,7 @@ class PHPExcel_Shared_OLERead {
'size' => $size);
// Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
if (($name == 'Workbook') || ($name == 'Book') || ($name == 'WORKBOOK')) {
if (($name == 'Workbook') || ($name == 'Book') || ($name == 'WORKBOOK') || ($name == 'BOOK')) {
$this->wrkbook = count($this->props) - 1;
}

2
libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/String.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
if (!defined('DATE_W3C')) {

2
libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Shared_Best_Fit
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Alignment.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Border.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Borders.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Color.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Conditional.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Fill.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/Font.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Style/NumberFormat.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Style
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

84
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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/
@@ -413,13 +413,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
{
if ($pSorted) {
// Re-order cell collection
$this->sortCellCollection();
return $this->sortCellCollection();
}
if (is_null($this->_cellCollection)) {
return array();
if (!is_null($this->_cellCollection)) {
return $this->_cellCollection->getCellList();
}
return $this->_cellCollection->getCellList();
return array();
}
/**
@@ -429,13 +428,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*/
public function sortCellCollection()
{
if (!$this->_cellCollectionIsSorted) {
if (!is_null($this->_cellCollection)) {
$this->_cellCollection->sortCellList();
if (!is_null($this->_cellCollection)) {
return $this->_cellCollection->getSortedCellList();
}
$this->_cellCollectionIsSorted = true;
}
return $this;
return array();
}
/**
@@ -837,13 +833,17 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param string $pCoordinate Coordinate of the cell
* @param mixed $pValue Value of the cell
* @return PHPExcel_Worksheet
* @param bool $returnCell Return the worksheet (false, default) or the cell (true)
* @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
*/
public function setCellValue($pCoordinate = 'A1', $pValue = null)
public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
{
// Set value
$this->getCell($pCoordinate)->setValue($pValue);
$cell = $this->getCell($pCoordinate);
$cell->setValue($pValue);
if ($returnCell) {
return $cell;
}
return $this;
}
@@ -853,11 +853,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param string $pColumn Numeric column coordinate of the cell
* @param string $pRow Numeric row coordinate of the cell
* @param mixed $pValue Value of the cell
* @return PHPExcel_Worksheet
* @param bool $returnCell Return the worksheet (false, default) or the cell (true)
* @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
*/
public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 0, $pValue = null)
public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 0, $pValue = null, $returnCell = false)
{
return $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValue($pValue);
$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
$cell->setValue($pValue);
if ($returnCell) {
return $cell;
}
return $this;
}
/**
@@ -2174,37 +2181,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Find cells that can be cleaned
foreach ($this->_cellCollection->getCellList() as $coordinate) {
$cell = $this->getCell($coordinate);
// Can be cleaned?
$canBeCleaned = false;
preg_match('/^(\w+)(\d+)$/U',$coordinate,$matches);
list(,$col,$row) = $matches;
$column = PHPExcel_Cell::columnIndexFromString($col);
/* Excel doesn't remove such empty cells
// Empty value?
if (is_null($cell->getValue()) || (!is_object($cell->getValue()) && $cell->getValue() === '' && !$cell->hasHyperlink())) {
// default style ?
if ($cell->getXfIndex() == 0) {
$canBeCleaned = true;
}
}
*/
// Referenced in image?
if (isset($imageCoordinates[$coordinate]) && $imageCoordinates[$coordinate] === true) {
$canBeCleaned = false;
}
// Clean?
if ($canBeCleaned) {
// Remove the cell
$this->_cellCollection->deleteCacheData($coordinate);
} else {
// Determine highest column and row
if ($highestColumn < PHPExcel_Cell::columnIndexFromString($cell->getColumn())) {
$highestColumn = PHPExcel_Cell::columnIndexFromString($cell->getColumn());
}
if ($cell->getRow() > $highestRow) {
$highestRow = $cell->getRow();
}
// Determine highest column and row
if ($highestColumn < $column) {
$highestColumn = $column;
}
if ($row > $highestRow) {
$highestRow = $row;
}
}

2
libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Worksheet_Drawing
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
View File

@@ -22,7 +22,7 @@
* @package PHPExcel_Worksheet_Drawing
* @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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/Protection.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

2
libraries/PHPExcel/PHPExcel/Worksheet/Row.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.3, 2010-05-17
* @version 1.7.3c, 2010-06-01
*/

Some files were not shown because too many files have changed in this diff Show More