alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: (dbonsch) Work item GH-78 - Restructuring of PHPExcel Exceptions

This commit is contained in:
Mark Baker 2013-01-15 21:42:28 +00:00
parent 907ad1ef66
commit 092fc7b5f7
63 changed files with 375 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/PHPExcel/Autoloader.php
View File

@ -31,7 +31,7 @@ PHPExcel_Autoloader::Register();
//PHPExcel_Shared_ZipStreamWrapper::register(); //PHPExcel_Shared_ZipStreamWrapper::register();
// check mbstring.func_overload // check mbstring.func_overload
if (ini_get('mbstring.func_overload') & 2) { if (ini_get('mbstring.func_overload') & 2) {
throw new Exception('Multibyte function overloading in PHP must be disabled for string functions (2).'); throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
} }
PHPExcel_Shared_String::buildCharacterSets(); PHPExcel_Shared_String::buildCharacterSets();

4
Classes/PHPExcel/CachedObjectStorage/CacheBase.php
View File

@ -106,7 +106,7 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
* *
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function updateCacheData(PHPExcel_Cell $cell) { public function updateCacheData(PHPExcel_Cell $cell) {
return $this->addCacheData($cell->getCoordinate(),$cell); return $this->addCacheData($cell->getCoordinate(),$cell);
@ -117,7 +117,7 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord) { public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) { if ($pCoord === $this->_currentObjectID) {

6
Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
View File

@ -62,7 +62,7 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -86,7 +86,7 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -105,7 +105,7 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

8
Classes/PHPExcel/CachedObjectStorage/ICache.php
View File

@ -41,7 +41,7 @@ interface PHPExcel_CachedObjectStorage_ICache
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell); public function addCacheData($pCoord, PHPExcel_Cell $cell);
@ -50,7 +50,7 @@ interface PHPExcel_CachedObjectStorage_ICache
* *
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function updateCacheData(PHPExcel_Cell $cell); public function updateCacheData(PHPExcel_Cell $cell);
@ -59,7 +59,7 @@ interface PHPExcel_CachedObjectStorage_ICache
* *
* @param string $pCoord Coordinate address of the cell to retrieve * @param string $pCoord Coordinate address of the cell to retrieve
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getCacheData($pCoord); public function getCacheData($pCoord);
@ -67,7 +67,7 @@ interface PHPExcel_CachedObjectStorage_ICache
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord); public function deleteCacheData($pCoord);

6
Classes/PHPExcel/CachedObjectStorage/Igbinary.php
View File

@ -40,7 +40,7 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -59,7 +59,7 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -78,7 +78,7 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

24
Classes/PHPExcel/CachedObjectStorage/Memcache.php
View File

@ -62,7 +62,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -72,7 +72,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
$this->__destruct(); $this->__destruct();
throw new Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache'); throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
} }
} }
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
@ -87,7 +87,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -121,7 +121,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
if ($success === false) { if ($success === false) {
// Entry no longer exists in Memcache, so clear it from the cache array // Entry no longer exists in Memcache, so clear it from the cache array
parent::deleteCacheData($pCoord); parent::deleteCacheData($pCoord);
throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache'); throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
} }
return true; return true;
} }
@ -133,7 +133,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {
@ -148,7 +148,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
if ($obj === false) { if ($obj === false) {
// Entry no longer exists in Memcache, so clear it from the cache array // Entry no longer exists in Memcache, so clear it from the cache array
parent::deleteCacheData($pCoord); parent::deleteCacheData($pCoord);
throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache'); throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
} }
} else { } else {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
@ -184,7 +184,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord) { public function deleteCacheData($pCoord) {
// Delete the entry from Memcache // Delete the entry from Memcache
@ -213,11 +213,11 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
if ($obj === false) { if ($obj === false) {
// Entry no longer exists in Memcache, so clear it from the cache array // Entry no longer exists in Memcache, so clear it from the cache array
parent::deleteCacheData($cellID); parent::deleteCacheData($cellID);
throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in MemCache');
} }
if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) { if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
$this->__destruct(); $this->__destruct();
throw new Exception('Failed to store cell '.$cellID.' in MemCache'); throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in MemCache');
} }
} }
} }
@ -264,7 +264,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
// Set a new Memcache object and connect to the Memcache server // Set a new Memcache object and connect to the Memcache server
$this->_memcache = new Memcache(); $this->_memcache = new Memcache();
if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) { 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); throw new PHPExcel_Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
} }
$this->_cacheTime = $cacheTime; $this->_cacheTime = $cacheTime;
@ -278,10 +278,10 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
* *
* @param string $host Memcache server * @param string $host Memcache server
* @param integer $port Memcache port * @param integer $port Memcache port
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function failureCallback($host, $port) { public function failureCallback($host, $port) {
throw new Exception('memcache '.$host.':'.$port.' failed'); throw new PHPExcel_Exception('memcache '.$host.':'.$port.' failed');
} }

4
Classes/PHPExcel/CachedObjectStorage/Memory.php
View File

@ -49,7 +49,7 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
$this->_cellCache[$pCoord] = $cell; $this->_cellCache[$pCoord] = $cell;
@ -61,7 +61,7 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

6
Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
View File

@ -40,7 +40,7 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -59,7 +59,7 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -78,7 +78,7 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

6
Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
View File

@ -40,7 +40,7 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -59,7 +59,7 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -78,7 +78,7 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

6
Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
View File

@ -54,7 +54,7 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -78,7 +78,7 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -97,7 +97,7 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {

24
Classes/PHPExcel/CachedObjectStorage/SQLite.php
View File

@ -54,14 +54,14 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
$this->_currentObject->detach(); $this->_currentObject->detach();
if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')")) if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
} }
$this->_currentObjectID = $this->_currentObject = null; $this->_currentObjectID = $this->_currentObject = null;
@ -74,7 +74,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -93,7 +93,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {
@ -105,7 +105,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC); $cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
if ($cellResultSet === false) { if ($cellResultSet === false) {
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
} elseif ($cellResultSet->numRows() == 0) { } elseif ($cellResultSet->numRows() == 0) {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
return null; return null;
@ -139,7 +139,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC); $cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
if ($cellResultSet === false) { if ($cellResultSet === false) {
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
} elseif ($cellResultSet->numRows() == 0) { } elseif ($cellResultSet->numRows() == 0) {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
return false; return false;
@ -152,7 +152,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord) { public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) { if ($pCoord === $this->_currentObjectID) {
@ -163,7 +163,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
// Check if the requested entry exists in the cache // Check if the requested entry exists in the cache
$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
if (!$this->_DBHandle->queryExec($query)) if (!$this->_DBHandle->queryExec($query))
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
} // function deleteCacheData() } // function deleteCacheData()
@ -182,7 +182,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
$query = "SELECT id FROM kvp_".$this->_TableName; $query = "SELECT id FROM kvp_".$this->_TableName;
$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC); $cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
if ($cellIdsResult === false) if ($cellIdsResult === false)
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$cellKeys = array(); $cellKeys = array();
foreach($cellIdsResult as $row) { foreach($cellIdsResult as $row) {
@ -207,7 +207,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
$tableName = str_replace('.','_',$this->_getUniqueID()); $tableName = str_replace('.','_',$this->_getUniqueID());
if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB) if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
AS SELECT * FROM kvp_'.$this->_TableName)) AS SELECT * FROM kvp_'.$this->_TableName))
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
// Copy the existing cell cache file // Copy the existing cell cache file
$this->_TableName = $tableName; $this->_TableName = $tableName;
@ -245,9 +245,9 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
$this->_DBHandle = new SQLiteDatabase($_DBName); $this->_DBHandle = new SQLiteDatabase($_DBName);
if ($this->_DBHandle === false) if ($this->_DBHandle === false)
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
throw new Exception(sqlite_error_string($this->_DBHandle->lastError())); throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
} }
} // function __construct() } // function __construct()

24
Classes/PHPExcel/CachedObjectStorage/SQLite3.php
View File

@ -54,7 +54,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -65,7 +65,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB); $query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
$result = $query->execute(); $result = $query->execute();
if ($result === false) if ($result === false)
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
} }
$this->_currentObjectID = $this->_currentObject = null; $this->_currentObjectID = $this->_currentObject = null;
@ -78,7 +78,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -97,7 +97,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {
@ -109,7 +109,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
$cellResult = $this->_DBHandle->querySingle($query); $cellResult = $this->_DBHandle->querySingle($query);
if ($cellResult === false) { if ($cellResult === false) {
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
} elseif (is_null($cellResult)) { } elseif (is_null($cellResult)) {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
return null; return null;
@ -142,7 +142,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
$cellResult = $this->_DBHandle->querySingle($query); $cellResult = $this->_DBHandle->querySingle($query);
if ($cellResult === false) { if ($cellResult === false) {
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
} elseif (is_null($cellResult)) { } elseif (is_null($cellResult)) {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
return false; return false;
@ -155,7 +155,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord) { public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) { if ($pCoord === $this->_currentObjectID) {
@ -167,7 +167,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'"; $query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
$result = $this->_DBHandle->exec($query); $result = $this->_DBHandle->exec($query);
if ($result === false) if ($result === false)
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
} // function deleteCacheData() } // function deleteCacheData()
@ -186,7 +186,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$query = "SELECT id FROM kvp_".$this->_TableName; $query = "SELECT id FROM kvp_".$this->_TableName;
$cellIdsResult = $this->_DBHandle->query($query); $cellIdsResult = $this->_DBHandle->query($query);
if ($cellIdsResult === false) if ($cellIdsResult === false)
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
$cellKeys = array(); $cellKeys = array();
while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) { while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
@ -211,7 +211,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$tableName = str_replace('.','_',$this->_getUniqueID()); $tableName = str_replace('.','_',$this->_getUniqueID());
if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB) if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
AS SELECT * FROM kvp_'.$this->_TableName)) AS SELECT * FROM kvp_'.$this->_TableName))
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
// Copy the existing cell cache file // Copy the existing cell cache file
$this->_TableName = $tableName; $this->_TableName = $tableName;
@ -249,9 +249,9 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
$this->_DBHandle = new SQLite3($_DBName); $this->_DBHandle = new SQLite3($_DBName);
if ($this->_DBHandle === false) if ($this->_DBHandle === false)
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
throw new Exception($this->_DBHandle->lastErrorMsg()); throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
} }
} // function __construct() } // function __construct()

20
Classes/PHPExcel/CachedObjectStorage/Wincache.php
View File

@ -55,7 +55,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
* and the 'nullify' the current cell object * and the 'nullify' the current cell object
* *
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
protected function _storeData() { protected function _storeData() {
if ($this->_currentCellIsDirty) { if ($this->_currentCellIsDirty) {
@ -65,12 +65,12 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) { if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
$this->__destruct(); $this->__destruct();
throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache'); throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
} }
} else { } else {
if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
$this->__destruct(); $this->__destruct();
throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache'); throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
} }
} }
$this->_currentCellIsDirty = false; $this->_currentCellIsDirty = false;
@ -86,7 +86,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
* @param string $pCoord Coordinate address of the cell to update * @param string $pCoord Coordinate address of the cell to update
* @param PHPExcel_Cell $cell Cell to update * @param PHPExcel_Cell $cell Cell to update
* @return void * @return void
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addCacheData($pCoord, PHPExcel_Cell $cell) { public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) { if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@ -119,7 +119,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
if ($success === false) { if ($success === false) {
// Entry no longer exists in Wincache, so clear it from the cache array // Entry no longer exists in Wincache, so clear it from the cache array
parent::deleteCacheData($pCoord); parent::deleteCacheData($pCoord);
throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache'); throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
} }
return true; return true;
} }
@ -131,7 +131,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
* Get cell at a specific coordinate * Get cell at a specific coordinate
* *
* @param string $pCoord Coordinate of the cell * @param string $pCoord Coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not found * @return PHPExcel_Cell Cell that was found, or null if not found
*/ */
public function getCacheData($pCoord) { public function getCacheData($pCoord) {
@ -148,7 +148,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
if ($success === false) { if ($success === false) {
// Entry no longer exists in WinCache, so clear it from the cache array // Entry no longer exists in WinCache, so clear it from the cache array
parent::deleteCacheData($pCoord); parent::deleteCacheData($pCoord);
throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache'); throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
} }
} else { } else {
// Return null if requested entry doesn't exist in cache // Return null if requested entry doesn't exist in cache
@ -184,7 +184,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
* Delete a cell in cache identified by coordinate address * Delete a cell in cache identified by coordinate address
* *
* @param string $pCoord Coordinate address of the cell to delete * @param string $pCoord Coordinate address of the cell to delete
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function deleteCacheData($pCoord) { public function deleteCacheData($pCoord) {
// Delete the entry from Wincache // Delete the entry from Wincache
@ -214,11 +214,11 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
if ($success === false) { if ($success === false) {
// Entry no longer exists in WinCache, so clear it from the cache array // Entry no longer exists in WinCache, so clear it from the cache array
parent::deleteCacheData($cellID); parent::deleteCacheData($cellID);
throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache'); throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in Wincache');
} }
if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) { if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
$this->__destruct(); $this->__destruct();
throw new Exception('Failed to store cell '.$cellID.' in Wincache'); throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
} }
} }
} }

38
Classes/PHPExcel/Calculation.php
View File

@ -1738,10 +1738,10 @@ class PHPExcel_Calculation {
* __clone implementation. Cloning should not be allowed in a Singleton! * __clone implementation. Cloning should not be allowed in a Singleton!
* *
* @access public * @access public
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public final function __clone() { public final function __clone() {
throw new Exception ('Cloning a Singleton is not allowed!'); throw new PHPExcel_Calculation_Exception ('Cloning a Singleton is not allowed!');
} // function __clone() } // function __clone()
@ -2125,13 +2125,13 @@ class PHPExcel_Calculation {
* @access public * @access public
* @param PHPExcel_Cell $pCell Cell to calculate * @param PHPExcel_Cell $pCell Cell to calculate
* @return mixed * @return mixed
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function calculate(PHPExcel_Cell $pCell = null) { public function calculate(PHPExcel_Cell $pCell = null) {
try { try {
return $this->calculateCellValue($pCell); return $this->calculateCellValue($pCell);
} catch (Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new Exception($e->getMessage())); throw(new PHPExcel_Calculation_Exception($e->getMessage()));
} }
} // function calculate() } // function calculate()
@ -2143,7 +2143,7 @@ class PHPExcel_Calculation {
* @param PHPExcel_Cell $pCell Cell to calculate * @param PHPExcel_Cell $pCell Cell to calculate
* @param Boolean $resetLog Flag indicating whether the debug log should be reset or not * @param Boolean $resetLog Flag indicating whether the debug log should be reset or not
* @return mixed * @return mixed
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true) { public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true) {
if ($resetLog) { if ($resetLog) {
@ -2167,8 +2167,8 @@ class PHPExcel_Calculation {
// Execute the calculation for the cell formula // Execute the calculation for the cell formula
try { try {
$result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell)); $result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
} catch (Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new Exception($e->getMessage())); throw(new PHPExcel_Calculation_Exception($e->getMessage()));
} }
if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) { if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
@ -2207,7 +2207,7 @@ class PHPExcel_Calculation {
* *
* @param string $formula Formula to parse * @param string $formula Formula to parse
* @return array * @return array
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function parseFormula($formula) { public function parseFormula($formula) {
// Basic validation that this is indeed a formula // Basic validation that this is indeed a formula
@ -2227,7 +2227,7 @@ class PHPExcel_Calculation {
* *
* @param string $formula Formula to parse * @param string $formula Formula to parse
* @return mixed * @return mixed
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function calculateFormula($formula, $cellID=null, PHPExcel_Cell $pCell = null) { public function calculateFormula($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
// Initialise the logging settings // Initialise the logging settings
@ -2241,8 +2241,8 @@ class PHPExcel_Calculation {
// Execute the calculation // Execute the calculation
try { try {
$result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell)); $result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
} catch (Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new Exception($e->getMessage())); throw(new PHPExcel_Calculation_Exception($e->getMessage()));
} }
// Reset calculation cacheing to its previous state // Reset calculation cacheing to its previous state
@ -2259,7 +2259,7 @@ class PHPExcel_Calculation {
* @param string $cellID The ID (e.g. A3) of the cell that we are calculating * @param string $cellID The ID (e.g. A3) of the cell that we are calculating
* @param PHPExcel_Cell $pCell Cell to calculate * @param PHPExcel_Cell $pCell Cell to calculate
* @return mixed * @return mixed
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) { public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
// echo '<b>'.$cellID.'</b><br />'; // echo '<b>'.$cellID.'</b><br />';
@ -3134,7 +3134,7 @@ class PHPExcel_Calculation {
// Perform the required operation against the operand 1 matrix, passing in operand 2 // Perform the required operation against the operand 1 matrix, passing in operand 2
$matrixResult = $matrix->concat($operand2); $matrixResult = $matrix->concat($operand2);
$result = $matrixResult->getArray(); $result = $matrixResult->getArray();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage()); $this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
$result = '#VALUE!'; $result = '#VALUE!';
} }
@ -3180,7 +3180,7 @@ class PHPExcel_Calculation {
$matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg); $matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg);
$matrixResult = $matrix1->arrayTimesEquals($multiplier); $matrixResult = $matrix1->arrayTimesEquals($multiplier);
$result = $matrixResult->getArray(); $result = $matrixResult->getArray();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage()); $this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
$result = '#VALUE!'; $result = '#VALUE!';
} }
@ -3535,7 +3535,7 @@ class PHPExcel_Calculation {
// Perform the required operation against the operand 1 matrix, passing in operand 2 // Perform the required operation against the operand 1 matrix, passing in operand 2
$matrixResult = $matrix->$matrixFunction($operand2); $matrixResult = $matrix->$matrixFunction($operand2);
$result = $matrixResult->getArray(); $result = $matrixResult->getArray();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage()); $this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
$result = '#VALUE!'; $result = '#VALUE!';
} }
@ -3600,7 +3600,7 @@ class PHPExcel_Calculation {
protected function _raiseFormulaError($errorMessage) { protected function _raiseFormulaError($errorMessage) {
$this->formulaError = $errorMessage; $this->formulaError = $errorMessage;
$this->debugLogStack = array(); $this->debugLogStack = array();
if (!$this->suppressFormulaErrors) throw new Exception($errorMessage); if (!$this->suppressFormulaErrors) throw new PHPExcel_Calculation_Exception($errorMessage);
trigger_error($errorMessage, E_USER_ERROR); trigger_error($errorMessage, E_USER_ERROR);
} // function _raiseFormulaError() } // function _raiseFormulaError()
@ -3611,7 +3611,7 @@ class PHPExcel_Calculation {
* @param string &$pRange String based range representation * @param string &$pRange String based range representation
* @param PHPExcel_Worksheet $pSheet Worksheet * @param PHPExcel_Worksheet $pSheet Worksheet
* @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned.
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) { public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
// Return value // Return value
@ -3667,7 +3667,7 @@ class PHPExcel_Calculation {
* @param string &$pRange String based range representation * @param string &$pRange String based range representation
* @param PHPExcel_Worksheet $pSheet Worksheet * @param PHPExcel_Worksheet $pSheet Worksheet
* @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned.
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) { public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
// Return value // Return value

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

@ -33,7 +33,7 @@
* @package PHPExcel_Calculation * @package PHPExcel_Calculation
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
*/ */
class PHPExcel_Calculation_Exception extends Exception { class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
/** /**
* Error handler callback * Error handler callback
* *

8
Classes/PHPExcel/Calculation/FormulaParser.php
View File

@ -93,13 +93,13 @@ class PHPExcel_Calculation_FormulaParser {
* Create a new PHPExcel_Calculation_FormulaParser * Create a new PHPExcel_Calculation_FormulaParser
* *
* @param string $pFormula Formula to parse * @param string $pFormula Formula to parse
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function __construct($pFormula = '') public function __construct($pFormula = '')
{ {
// Check parameters // Check parameters
if (is_null($pFormula)) { if (is_null($pFormula)) {
throw new Exception("Invalid parameter passed: formula"); throw new PHPExcel_Calculation_Exception("Invalid parameter passed: formula");
} }
// Initialise values // Initialise values
@ -122,13 +122,13 @@ class PHPExcel_Calculation_FormulaParser {
* *
* @param int $pId Token id * @param int $pId Token id
* @return string * @return string
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function getToken($pId = 0) { public function getToken($pId = 0) {
if (isset($this->_tokens[$pId])) { if (isset($this->_tokens[$pId])) {
return $this->_tokens[$pId]; return $this->_tokens[$pId];
} else { } else {
throw new Exception("Token with id $pId does not exist."); throw new PHPExcel_Calculation_Exception("Token with id $pId does not exist.");
} }
} }

8
Classes/PHPExcel/Calculation/Function.php
View File

@ -74,7 +74,7 @@ class PHPExcel_Calculation_Function {
* @param string $pCategory Category (represented by CATEGORY_*) * @param string $pCategory Category (represented by CATEGORY_*)
* @param string $pExcelName Excel function name * @param string $pExcelName Excel function name
* @param string $pPHPExcelName PHPExcel function mapping * @param string $pPHPExcelName PHPExcel function mapping
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL) public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
{ {
@ -84,7 +84,7 @@ class PHPExcel_Calculation_Function {
$this->_excelName = $pExcelName; $this->_excelName = $pExcelName;
$this->_phpExcelName = $pPHPExcelName; $this->_phpExcelName = $pPHPExcelName;
} else { } else {
throw new Exception("Invalid parameters passed."); throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
} }
} }
@ -101,13 +101,13 @@ class PHPExcel_Calculation_Function {
* Set Category (represented by CATEGORY_*) * Set Category (represented by CATEGORY_*)
* *
* @param string $value * @param string $value
* @throws Exception * @throws PHPExcel_Calculation_Exception
*/ */
public function setCategory($value = null) { public function setCategory($value = null) {
if (!is_null($value)) { if (!is_null($value)) {
$this->_category = $value; $this->_category = $value;
} else { } else {
throw new Exception("Invalid parameter passed."); throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
} }
} }

6
Classes/PHPExcel/Calculation/MathTrig.php
View File

@ -547,7 +547,7 @@ class PHPExcel_Calculation_MathTrig {
try { try {
$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData); $matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
return $matrix->det(); return $matrix->det();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE(); return PHPExcel_Calculation_Functions::VALUE();
} }
} // function MDETERM() } // function MDETERM()
@ -589,7 +589,7 @@ class PHPExcel_Calculation_MathTrig {
try { try {
$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData); $matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
return $matrix->inverse()->getArray(); return $matrix->inverse()->getArray();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE(); return PHPExcel_Calculation_Functions::VALUE();
} }
} // function MINVERSE() } // function MINVERSE()
@ -642,7 +642,7 @@ class PHPExcel_Calculation_MathTrig {
} }
return $matrixA->times($matrixB)->getArray(); return $matrixA->times($matrixB)->getArray();
} catch (Exception $ex) { } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE(); return PHPExcel_Calculation_Functions::VALUE();
} }
} // function MMULT() } // function MMULT()

4
Classes/PHPExcel/Cell.php
View File

@ -296,7 +296,7 @@ class PHPExcel_Cell
// echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />'; // echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />';
$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog); $result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog);
// echo $this->getCoordinate().' calculation result is '.$result.'<br />'; // echo $this->getCoordinate().' calculation result is '.$result.'<br />';
} catch ( Exception $ex ) { } catch ( PHPExcel_Exception $ex ) {
if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) { if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
// echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />'; // echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
return $this->_calculatedValue; // Fallback for calculations referencing external files. return $this->_calculatedValue; // Fallback for calculations referencing external files.
@ -304,7 +304,7 @@ class PHPExcel_Cell
// echo 'Calculation Exception: '.$ex->getMessage().'<br />'; // echo 'Calculation Exception: '.$ex->getMessage().'<br />';
$result = '#N/A'; $result = '#N/A';
throw( throw(
new PHPExcel_Exception( new PHPExcel_Calculation_Exception(
$this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage() $this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
) )
); );

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

@ -153,8 +153,6 @@ class PHPExcel_Cell_DataValidation
/** /**
* Create a new PHPExcel_Cell_DataValidation * Create a new PHPExcel_Cell_DataValidation
*
* @throws Exception
*/ */
public function __construct() public function __construct()
{ {

2
Classes/PHPExcel/Chart.php
View File

@ -184,7 +184,7 @@ class PHPExcel_Chart
* Set Worksheet * Set Worksheet
* *
* @param PHPExcel_Worksheet $pValue * @param PHPExcel_Worksheet $pValue
* @throws Exception * @throws PHPExcel_Chart_Exception
* @return PHPExcel_Chart * @return PHPExcel_Chart
*/ */
public function setWorksheet(PHPExcel_Worksheet $pValue = null) { public function setWorksheet(PHPExcel_Worksheet $pValue = null) {

2
Classes/PHPExcel/Chart/Exception.php
View File

@ -33,7 +33,7 @@
* @package PHPExcel_Chart * @package PHPExcel_Chart
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
*/ */
class PHPExcel_Chart_Exception extends Exception { class PHPExcel_Chart_Exception extends PHPExcel_Exception {
/** /**
* Error handler callback * Error handler callback
* *

2
Classes/PHPExcel/Comment.php
View File

@ -101,7 +101,7 @@ class PHPExcel_Comment implements PHPExcel_IComparable
/** /**
* Create a new PHPExcel_Comment * Create a new PHPExcel_Comment
* *
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function __construct() public function __construct()
{ {

4
Classes/PHPExcel/HashTable.php
View File

@ -86,7 +86,7 @@ class PHPExcel_HashTable
* Add HashTable item * Add HashTable item
* *
* @param PHPExcel_IComparable $pSource Item to add * @param PHPExcel_IComparable $pSource Item to add
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function add(PHPExcel_IComparable $pSource = null) { public function add(PHPExcel_IComparable $pSource = null) {
$hash = $pSource->getHashCode(); $hash = $pSource->getHashCode();
@ -100,7 +100,7 @@ class PHPExcel_HashTable
* Remove HashTable item * Remove HashTable item
* *
* @param PHPExcel_IComparable $pSource Item to remove * @param PHPExcel_IComparable $pSource Item to remove
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function remove(PHPExcel_IComparable $pSource = null) { public function remove(PHPExcel_IComparable $pSource = null) {
$hash = $pSource->getHashCode(); $hash = $pSource->getHashCode();

36
Classes/PHPExcel/Reader/Excel5.php
View File

@ -409,7 +409,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// get excel data // get excel data
$res = $ole->read($pFilename); $res = $ole->read($pFilename);
return true; return true;
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
return false; return false;
} }
} }
@ -2518,7 +2518,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
try { try {
$formula = $this->_getFormulaFromStructure($formulaStructure); $formula = $this->_getFormulaFromStructure($formulaStructure);
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
$formula = ''; $formula = '';
} }
@ -3665,7 +3665,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$formula = $this->_getFormulaFromStructure($formulaStructure); // get formula in human language $formula = $this->_getFormulaFromStructure($formulaStructure); // get formula in human language
$cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA); $cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
$cell->setValueExplicit($value, $dataType); $cell->setValueExplicit($value, $dataType);
} }
} else { } else {
@ -3995,7 +3995,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// offset: 0; size: 2; option flags // offset: 0; size: 2; option flags
$options = self::_GetInt2d($recordData, 0); $options = self::_GetInt2d($recordData, 0);
// offset: 2; size: 2; index to first visible row // offset: 2; size: 2; index to first visible row
$firstVisibleRow = self::_GetInt2d($recordData, 2); $firstVisibleRow = self::_GetInt2d($recordData, 2);
// offset: 4; size: 2; index to first visible colum // offset: 4; size: 2; index to first visible colum
@ -4033,9 +4033,9 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view // bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view
$isPageBreakPreview = (bool) ((0x0800 & $options) >> 11); $isPageBreakPreview = (bool) ((0x0800 & $options) >> 11);
//FIXME: set $firstVisibleRow and $firstVisibleColumn //FIXME: set $firstVisibleRow and $firstVisibleColumn
if ($this->_phpSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT) { if ($this->_phpSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT) {
//NOTE: this setting is inferior to page layout view(Excel2007-) //NOTE: this setting is inferior to page layout view(Excel2007-)
$view = $isPageBreakPreview? PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW : $view = $isPageBreakPreview? PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW :
@ -4058,9 +4058,9 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// move stream pointer to next record // move stream pointer to next record
$this->_pos += 4 + $length; $this->_pos += 4 + $length;
//var_dump(unpack("vrt/vgrbitFrt/V2reserved/vwScalePLV/vgrbit", $recordData)); //var_dump(unpack("vrt/vgrbitFrt/V2reserved/vwScalePLV/vgrbit", $recordData));
// offset: 0; size: 2; rt // offset: 0; size: 2; rt
//->ignore //->ignore
$rt = self::_GetInt2d($recordData, 0); $rt = self::_GetInt2d($recordData, 0);
@ -4069,20 +4069,20 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$grbitFrt = self::_GetInt2d($recordData, 2); $grbitFrt = self::_GetInt2d($recordData, 2);
// offset: 4; size: 8; reserved // offset: 4; size: 8; reserved
//->ignore //->ignore
// offset: 12; size 2; zoom scale // offset: 12; size 2; zoom scale
$wScalePLV = self::_GetInt2d($recordData, 12); $wScalePLV = self::_GetInt2d($recordData, 12);
// offset: 14; size 2; grbit // offset: 14; size 2; grbit
$grbit = self::_GetInt2d($recordData, 14); $grbit = self::_GetInt2d($recordData, 14);
// decomprise grbit // decomprise grbit
$fPageLayoutView = $grbit & 0x01; $fPageLayoutView = $grbit & 0x01;
$fRulerVisible = ($grbit >> 1) & 0x01; //no support $fRulerVisible = ($grbit >> 1) & 0x01; //no support
$fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support $fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
if ($fPageLayoutView === 1) { if ($fPageLayoutView === 1) {
$this->_phpSheet->getSheetView()->setView(PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT); $this->_phpSheet->getSheetView()->setView(PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT);
$this->_phpSheet->getSheetView()->setZoomScale($wScalePLV); //set by Excel2007 only if SHEETVIEW_PAGE_LAYOUT $this->_phpSheet->getSheetView()->setZoomScale($wScalePLV); //set by Excel2007 only if SHEETVIEW_PAGE_LAYOUT
} }
//otherwise, we cannot know whether SHEETVIEW_PAGE_LAYOUT or SHEETVIEW_PAGE_BREAK_PREVIEW. //otherwise, we cannot know whether SHEETVIEW_PAGE_LAYOUT or SHEETVIEW_PAGE_BREAK_PREVIEW.
} }
@ -4252,7 +4252,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// offset: 0; size: 8; cell range address of all cells containing this hyperlink // offset: 0; size: 8; cell range address of all cells containing this hyperlink
try { try {
$cellRange = $this->_readBIFF8CellRangeAddressFixed($recordData, 0, 8); $cellRange = $this->_readBIFF8CellRangeAddressFixed($recordData, 0, 8);
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
return; return;
} }
@ -4536,7 +4536,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
if ($type == PHPExcel_Cell_DataValidation::TYPE_LIST) { if ($type == PHPExcel_Cell_DataValidation::TYPE_LIST) {
$formula1 = str_replace(chr(0), ',', $formula1); $formula1 = str_replace(chr(0), ',', $formula1);
} }
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
return; return;
} }
$offset += $sz1; $offset += $sz1;
@ -4553,7 +4553,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$formula2 = pack('v', $sz2) . $formula2; // prepend the length $formula2 = pack('v', $sz2) . $formula2; // prepend the length
try { try {
$formula2 = $this->_getFormulaFromStructure($formula2); $formula2 = $this->_getFormulaFromStructure($formula2);
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
return; return;
} }
$offset += $sz2; $offset += $sz2;
@ -4765,7 +4765,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
for ($i = 0; $i < $cref; ++$i) { for ($i = 0; $i < $cref; ++$i) {
try { try {
$cellRange = $this->_readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8)); $cellRange = $this->_readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
return; return;
} }
$cellRanges[] = $cellRange; $cellRanges[] = $cellRange;
@ -5717,7 +5717,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4)); $cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
$data = "$sheetRange!$cellAddress"; $data = "$sheetRange!$cellAddress";
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
// deleted sheet reference // deleted sheet reference
$data = '#REF!'; $data = '#REF!';
} }
@ -5736,7 +5736,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8)); $cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
$data = "$sheetRange!$cellRangeAddress"; $data = "$sheetRange!$cellRangeAddress";
} catch (PHPExcel_Reader_Exception $e) { } catch (PHPExcel_Exception $e) {
// deleted sheet reference // deleted sheet reference
$data = '#REF!'; $data = '#REF!';
} }

2
Classes/PHPExcel/Reader/Exception.php
View File

@ -33,7 +33,7 @@
* @package PHPExcel_Reader * @package PHPExcel_Reader
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
*/ */
class PHPExcel_Reader_Exception extends Exception { class PHPExcel_Reader_Exception extends PHPExcel_Exception {
/** /**
* Error handler callback * Error handler callback
* *

24
Classes/PHPExcel/ReferenceHelper.php
View File

@ -74,7 +74,7 @@ class PHPExcel_ReferenceHelper
* @param int $pBefore Insert before this one * @param int $pBefore Insert before this one
* @param int $pNumCols Number of columns to insert * @param int $pNumCols Number of columns to insert
* @param int $pNumRows Number of rows to insert * @param int $pNumRows Number of rows to insert
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = null) { public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = null) {
$remove = ($pNumCols < 0 || $pNumRows < 0); $remove = ($pNumCols < 0 || $pNumRows < 0);
@ -134,10 +134,10 @@ class PHPExcel_ReferenceHelper
// Should the cell be updated? Move value and cellXf index from one cell to another. // Should the cell be updated? Move value and cellXf index from one cell to another.
if (($cellIndex >= $beforeColumnIndex) && if (($cellIndex >= $beforeColumnIndex) &&
($cell->getRow() >= $beforeRow)) { ($cell->getRow() >= $beforeRow)) {
// Update cell styles // Update cell styles
$pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex()); $pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
// Insert this cell at its new location // Insert this cell at its new location
if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) { if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
// Formula should be adjusted // Formula should be adjusted
@ -420,9 +420,9 @@ class PHPExcel_ReferenceHelper
* @param int $pNumCols Number of columns to insert * @param int $pNumCols Number of columns to insert
* @param int $pNumRows Number of rows to insert * @param int $pNumRows Number of rows to insert
* @return string Updated formula * @return string Updated formula
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') { public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') {
// Update cell references in the formula // Update cell references in the formula
$formulaBlocks = explode('"',$pFormula); $formulaBlocks = explode('"',$pFormula);
$i = false; $i = false;
@ -559,7 +559,7 @@ class PHPExcel_ReferenceHelper
* @param int $pNumCols Number of columns to increment * @param int $pNumCols Number of columns to increment
* @param int $pNumRows Number of rows to increment * @param int $pNumRows Number of rows to increment
* @return string Updated cell range * @return string Updated cell range
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) { public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
// Is it in another worksheet? Will not have to update anything. // Is it in another worksheet? Will not have to update anything.
@ -613,7 +613,7 @@ class PHPExcel_ReferenceHelper
* @param int $pNumCols Number of columns to increment * @param int $pNumCols Number of columns to increment
* @param int $pNumRows Number of rows to increment * @param int $pNumRows Number of rows to increment
* @return string Updated cell range * @return string Updated cell range
* @throws Exception * @throws PHPExcel_Exception
*/ */
private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) { private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
if (strpos($pCellRange,':') !== false || strpos($pCellRange, ',') !== false) { if (strpos($pCellRange,':') !== false || strpos($pCellRange, ',') !== false) {
@ -638,7 +638,7 @@ class PHPExcel_ReferenceHelper
// Recreate range string // Recreate range string
return PHPExcel_Cell::buildRange($range); return PHPExcel_Cell::buildRange($range);
} else { } else {
throw new Exception("Only cell ranges may be passed to this method."); throw new PHPExcel_Exception("Only cell ranges may be passed to this method.");
} }
} }
@ -650,7 +650,7 @@ class PHPExcel_ReferenceHelper
* @param int $pNumCols Number of columns to increment * @param int $pNumCols Number of columns to increment
* @param int $pNumRows Number of rows to increment * @param int $pNumRows Number of rows to increment
* @return string Updated cell reference * @return string Updated cell reference
* @throws Exception * @throws PHPExcel_Exception
*/ */
private function _updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) { private function _updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) { if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) {
@ -680,16 +680,16 @@ class PHPExcel_ReferenceHelper
// Return new reference // Return new reference
return $newColumn . $newRow; return $newColumn . $newRow;
} else { } else {
throw new Exception("Only single cell references may be passed to this method."); throw new PHPExcel_Exception("Only single cell references may be passed to this method.");
} }
} }
/** /**
* __clone implementation. Cloning should not be allowed in a Singleton! * __clone implementation. Cloning should not be allowed in a Singleton!
* *
* @throws Exception * @throws PHPExcel_Exception
*/ */
public final function __clone() { public final function __clone() {
throw new Exception("Cloning a Singleton is not allowed!"); throw new PHPExcel_Exception("Cloning a Singleton is not allowed!");
} }
} }

12
Classes/PHPExcel/RichText.php
View File

@ -46,7 +46,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
* Create a new PHPExcel_RichText instance * Create a new PHPExcel_RichText instance
* *
* @param PHPExcel_Cell $pParent * @param PHPExcel_Cell $pParent
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function __construct(PHPExcel_Cell $pCell = null) public function __construct(PHPExcel_Cell $pCell = null)
{ {
@ -71,7 +71,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
* Add text * Add text
* *
* @param PHPExcel_RichText_ITextElement $pText Rich text element * @param PHPExcel_RichText_ITextElement $pText Rich text element
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_RichText * @return PHPExcel_RichText
*/ */
public function addText(PHPExcel_RichText_ITextElement $pText = null) public function addText(PHPExcel_RichText_ITextElement $pText = null)
@ -85,7 +85,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
* *
* @param string $pText Text * @param string $pText Text
* @return PHPExcel_RichText_TextElement * @return PHPExcel_RichText_TextElement
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function createText($pText = '') public function createText($pText = '')
{ {
@ -99,7 +99,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
* *
* @param string $pText Text * @param string $pText Text
* @return PHPExcel_RichText_Run * @return PHPExcel_RichText_Run
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function createTextRun($pText = '') public function createTextRun($pText = '')
{ {
@ -150,7 +150,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
* Set Rich Text elements * Set Rich Text elements
* *
* @param PHPExcel_RichText_ITextElement[] $pElements Array of elements * @param PHPExcel_RichText_ITextElement[] $pElements Array of elements
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_RichText * @return PHPExcel_RichText
*/ */
public function setRichTextElements($pElements = null) public function setRichTextElements($pElements = null)
@ -158,7 +158,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
if (is_array($pElements)) { if (is_array($pElements)) {
$this->_richTextElements = $pElements; $this->_richTextElements = $pElements;
} else { } else {
throw new Exception("Invalid PHPExcel_RichText_ITextElement[] array passed."); throw new PHPExcel_Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
} }
return $this; return $this;
} }

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

@ -65,7 +65,7 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
* Set font * Set font
* *
* @param PHPExcel_Style_Font $pFont Font * @param PHPExcel_Style_Font $pFont Font
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_RichText_ITextElement * @return PHPExcel_RichText_ITextElement
*/ */
public function setFont(PHPExcel_Style_Font $pFont = null) { public function setFont(PHPExcel_Style_Font $pFont = null) {

8
Classes/PHPExcel/Shared/CodePage.php
View File

@ -41,14 +41,14 @@ class PHPExcel_Shared_CodePage
* *
* @param integer $codePage Microsoft Code Page Indentifier * @param integer $codePage Microsoft Code Page Indentifier
* @return string Code Page Name * @return string Code Page Name
* @throws Exception * @throws PHPExcel_Exception
*/ */
public static function NumberToName($codePage = 1252) public static function NumberToName($codePage = 1252)
{ {
switch ($codePage) { switch ($codePage) {
case 367: return 'ASCII'; break; // ASCII case 367: return 'ASCII'; break; // ASCII
case 437: return 'CP437'; break; // OEM US case 437: return 'CP437'; break; // OEM US
case 720: throw new Exception('Code page 720 not supported.'); case 720: throw new PHPExcel_Exception('Code page 720 not supported.');
break; // OEM Arabic break; // OEM Arabic
case 737: return 'CP737'; break; // OEM Greek case 737: return 'CP737'; break; // OEM Greek
case 775: return 'CP775'; break; // OEM Baltic case 775: return 'CP775'; break; // OEM Baltic
@ -89,13 +89,13 @@ class PHPExcel_Shared_CodePage
case 10079: return 'MACICELAND'; break; // Macintosh Icelandic case 10079: return 'MACICELAND'; break; // Macintosh Icelandic
case 10081: return 'MACTURKISH'; break; // Macintosh Turkish case 10081: return 'MACTURKISH'; break; // Macintosh Turkish
case 32768: return 'MAC'; break; // Apple Roman case 32768: return 'MAC'; break; // Apple Roman
case 32769: throw new Exception('Code page 32769 not supported.'); case 32769: throw new PHPExcel_Exception('Code page 32769 not supported.');
break; // ANSI Latin I (BIFF2-BIFF3) break; // ANSI Latin I (BIFF2-BIFF3)
case 65000: return 'UTF-7'; break; // Unicode (UTF-7) case 65000: return 'UTF-7'; break; // Unicode (UTF-7)
case 65001: return 'UTF-8'; break; // Unicode (UTF-8) case 65001: return 'UTF-8'; break; // Unicode (UTF-8)
} }
throw new Exception('Unknown codepage: ' . $codePage); throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
} }
} }

14
Classes/PHPExcel/Shared/Font.php
View File

@ -271,7 +271,7 @@ class PHPExcel_Shared_Font
try { try {
// If autosize method is set to 'approx', use approximation // If autosize method is set to 'approx', use approximation
if (self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX) { if (self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX) {
throw new Exception('AutoSize method is set to approx'); throw new PHPExcel_Exception('AutoSize method is set to approx');
} }
// Width of text in pixels excl. padding // Width of text in pixels excl. padding
@ -280,7 +280,7 @@ class PHPExcel_Shared_Font
// Excel adds some padding, use 1.07 of the width of an 'n' glyph // Excel adds some padding, use 1.07 of the width of an 'n' glyph
$columnWidth += ceil(self::getTextWidthPixelsExact('0', $font, 0) * 1.07); // pixels incl. padding $columnWidth += ceil(self::getTextWidthPixelsExact('0', $font, 0) * 1.07); // pixels incl. padding
} catch (Exception $e) { } catch (PHPExcel_Exception $e) {
// Width of text in pixels excl. padding, approximation // Width of text in pixels excl. padding, approximation
$columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation); $columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation);
@ -302,11 +302,11 @@ class PHPExcel_Shared_Font
* @param PHPExcel_Style_Font * @param PHPExcel_Style_Font
* @param int $rotation * @param int $rotation
* @return int * @return int
* @throws Exception * @throws PHPExcel_Exception
*/ */
public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) { public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) {
if (!function_exists('imagettfbbox')) { if (!function_exists('imagettfbbox')) {
throw new Exception('GD library needs to be enabled'); throw new PHPExcel_Exception('GD library needs to be enabled');
} }
// font size should really be supplied in pixels in GD2, // font size should really be supplied in pixels in GD2,
@ -425,7 +425,7 @@ class PHPExcel_Shared_Font
*/ */
public static function getTrueTypeFontFileFromFont($font) { public static function getTrueTypeFontFileFromFont($font) {
if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) { if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
throw new Exception('Valid directory to TrueType Font files not specified'); throw new PHPExcel_Exception('Valid directory to TrueType Font files not specified');
} }
$name = $font->getName(); $name = $font->getName();
@ -530,7 +530,7 @@ class PHPExcel_Shared_Font
break; break;
default: default:
throw new Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file'); throw new PHPExcel_Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
break; break;
} }
@ -538,7 +538,7 @@ class PHPExcel_Shared_Font
// Check if file actually exists // Check if file actually exists
if (!file_exists($fontFile)) { if (!file_exists($fontFile)) {
throw New Exception('TrueType Font file not found'); throw New PHPExcel_Exception('TrueType Font file not found');
} }
return $fontFile; return $fontFile;

8
Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
View File

@ -73,7 +73,7 @@ class CholeskyDecomposition {
} }
} }
} else { } else {
throw new Exception(JAMAError(ArgumentTypeException)); throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
} }
} // function __construct() } // function __construct()
@ -136,13 +136,13 @@ class CholeskyDecomposition {
return new Matrix($X, $this->m, $nx); return new Matrix($X, $this->m, $nx);
} else { } else {
throw new Exception(JAMAError(MatrixSPDException)); throw new PHPExcel_Calculation_Exception(JAMAError(MatrixSPDException));
} }
} else { } else {
throw new Exception(JAMAError(MatrixDimensionException)); throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionException));
} }
} else { } else {
throw new Exception(JAMAError(ArgumentTypeException)); throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
} }
} // function solve() } // function solve()

12
Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
View File

@ -115,7 +115,7 @@ class PHPExcel_Shared_JAMA_LUDecomposition {
} }
} }
} else { } else {
throw new Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException); throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
} }
} // function __construct() } // function __construct()
@ -208,7 +208,7 @@ class PHPExcel_Shared_JAMA_LUDecomposition {
} }
return $d; return $d;
} else { } else {
throw new Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException); throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
} }
} // function det() } // function det()
@ -218,8 +218,8 @@ class PHPExcel_Shared_JAMA_LUDecomposition {
* *
* @param $B A Matrix with as many rows as A and any number of columns. * @param $B A Matrix with as many rows as A and any number of columns.
* @return X so that L*U*X = B(piv,:) * @return X so that L*U*X = B(piv,:)
* @exception IllegalArgumentException Matrix row dimensions must agree. * @PHPExcel_Calculation_Exception IllegalArgumentException Matrix row dimensions must agree.
* @exception RuntimeException Matrix is singular. * @PHPExcel_Calculation_Exception RuntimeException Matrix is singular.
*/ */
public function solve($B) { public function solve($B) {
if ($B->getRowDimension() == $this->m) { if ($B->getRowDimension() == $this->m) {
@ -248,10 +248,10 @@ class PHPExcel_Shared_JAMA_LUDecomposition {
} }
return $X; return $X;
} else { } else {
throw new Exception(self::MatrixSingularException); throw new PHPExcel_Calculation_Exception(self::MatrixSingularException);
} }
} else { } else {
throw new Exception(self::MatrixSquareException); throw new PHPExcel_Calculation_Exception(self::MatrixSquareException);
} }
} // function solve() } // function solve()

124
Classes/PHPExcel/Shared/JAMA/Matrix.php
View File

@ -102,15 +102,15 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
} }
} else { } else {
throw new Exception(self::ArrayLengthException); throw new PHPExcel_Calculation_Exception(self::ArrayLengthException);
} }
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function __construct() } // function __construct()
@ -177,8 +177,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//A($i0...; $j0...) //A($i0...; $j0...)
case 'integer,integer': case 'integer,integer':
list($i0, $j0) = $args; list($i0, $j0) = $args;
if ($i0 >= 0) { $m = $this->m - $i0; } else { throw new Exception(self::ArgumentBoundsException); } if ($i0 >= 0) { $m = $this->m - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if ($j0 >= 0) { $n = $this->n - $j0; } else { throw new Exception(self::ArgumentBoundsException); } if ($j0 >= 0) { $n = $this->n - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m, $n); $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
for($i = $i0; $i < $this->m; ++$i) { for($i = $i0; $i < $this->m; ++$i) {
for($j = $j0; $j < $this->n; ++$j) { for($j = $j0; $j < $this->n; ++$j) {
@ -190,8 +190,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//A($i0...$iF; $j0...$jF) //A($i0...$iF; $j0...$jF)
case 'integer,integer,integer,integer': case 'integer,integer,integer,integer':
list($i0, $iF, $j0, $jF) = $args; list($i0, $iF, $j0, $jF) = $args;
if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new Exception(self::ArgumentBoundsException); } if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new Exception(self::ArgumentBoundsException); } if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1); $R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1);
for($i = $i0; $i <= $iF; ++$i) { for($i = $i0; $i <= $iF; ++$i) {
for($j = $j0; $j <= $jF; ++$j) { for($j = $j0; $j <= $jF; ++$j) {
@ -203,8 +203,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//$R = array of row indices; $C = array of column indices //$R = array of row indices; $C = array of column indices
case 'array,array': case 'array,array':
list($RL, $CL) = $args; list($RL, $CL) = $args;
if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m, $n); $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
for($i = 0; $i < $m; ++$i) { for($i = 0; $i < $m; ++$i) {
for($j = 0; $j < $n; ++$j) { for($j = 0; $j < $n; ++$j) {
@ -216,8 +216,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//$RL = array of row indices; $CL = array of column indices //$RL = array of row indices; $CL = array of column indices
case 'array,array': case 'array,array':
list($RL, $CL) = $args; list($RL, $CL) = $args;
if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m, $n); $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
for($i = 0; $i < $m; ++$i) { for($i = 0; $i < $m; ++$i) {
for($j = 0; $j < $n; ++$j) { for($j = 0; $j < $n; ++$j) {
@ -229,8 +229,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//A($i0...$iF); $CL = array of column indices //A($i0...$iF); $CL = array of column indices
case 'integer,integer,array': case 'integer,integer,array':
list($i0, $iF, $CL) = $args; list($i0, $iF, $CL) = $args;
if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new Exception(self::ArgumentBoundsException); } if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m, $n); $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
for($i = $i0; $i < $iF; ++$i) { for($i = $i0; $i < $iF; ++$i) {
for($j = 0; $j < $n; ++$j) { for($j = 0; $j < $n; ++$j) {
@ -242,8 +242,8 @@ class PHPExcel_Shared_JAMA_Matrix {
//$RL = array of row indices //$RL = array of row indices
case 'array,integer,integer': case 'array,integer,integer':
list($RL, $j0, $jF) = $args; list($RL, $j0, $jF) = $args;
if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); } if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new Exception(self::ArgumentBoundsException); } if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
$R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1); $R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1);
for($i = 0; $i < $m; ++$i) { for($i = 0; $i < $m; ++$i) {
for($j = $j0; $j <= $jF; ++$j) { for($j = $j0; $j <= $jF; ++$j) {
@ -253,11 +253,11 @@ class PHPExcel_Shared_JAMA_Matrix {
return $R; return $R;
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function getMatrix() } // function getMatrix()
@ -274,10 +274,10 @@ class PHPExcel_Shared_JAMA_Matrix {
if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) { if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) {
return true; return true;
} else { } else {
throw new Exception(self::MatrixDimensionException); throw new PHPExcel_Calculation_Exception(self::MatrixDimensionException);
} }
} else { } else {
throw new Exception(self::ArgumentTypeException); throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
} }
} // function checkMatrixDimensions() } // function checkMatrixDimensions()
@ -345,7 +345,7 @@ class PHPExcel_Shared_JAMA_Matrix {
return $this->getMatrix($i0, 0, $i0 + 1, $this->n); return $this->getMatrix($i0, 0, $i0 + 1, $this->n);
} }
} else { } else {
throw new Exception(self::ArgumentTypeException); throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
} }
} // function getMatrixByRow() } // function getMatrixByRow()
@ -366,7 +366,7 @@ class PHPExcel_Shared_JAMA_Matrix {
return $this->getMatrix(0, $j0, $this->m, $j0 + 1); return $this->getMatrix(0, $j0, $this->m, $j0 + 1);
} }
} else { } else {
throw new Exception(self::ArgumentTypeException); throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
} }
} // function getMatrixByCol() } // function getMatrixByCol()
@ -428,13 +428,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -445,7 +445,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function plus() } // function plus()
@ -464,13 +464,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -495,7 +495,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $this; return $this;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function plusEquals() } // function plusEquals()
@ -514,13 +514,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -531,7 +531,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function minus() } // function minus()
@ -550,13 +550,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -581,7 +581,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $this; return $this;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function minusEquals() } // function minusEquals()
@ -601,13 +601,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -618,7 +618,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayTimes() } // function arrayTimes()
@ -638,13 +638,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -669,7 +669,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $this; return $this;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayTimesEquals() } // function arrayTimesEquals()
@ -689,13 +689,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -725,7 +725,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayRightDivide() } // function arrayRightDivide()
@ -745,13 +745,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -762,7 +762,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayRightDivideEquals() } // function arrayRightDivideEquals()
@ -782,13 +782,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -799,7 +799,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayLeftDivide() } // function arrayLeftDivide()
@ -819,13 +819,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -836,7 +836,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $M; return $M;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function arrayLeftDivideEquals() } // function arrayLeftDivideEquals()
@ -855,7 +855,7 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $B = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $B = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
if ($this->n == $B->m) { if ($this->n == $B->m) {
$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n); $C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
for($j = 0; $j < $B->n; ++$j) { for($j = 0; $j < $B->n; ++$j) {
@ -873,7 +873,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $C; return $C;
} else { } else {
throw new Exception(JAMAError(MatrixDimensionMismatch)); throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
} }
break; break;
case 'array': case 'array':
@ -891,7 +891,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $C; return $C;
} else { } else {
throw new Exception(JAMAError(MatrixDimensionMismatch)); throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
} }
return $M; return $M;
break; break;
@ -923,11 +923,11 @@ class PHPExcel_Shared_JAMA_Matrix {
return $C; return $C;
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function times() } // function times()
@ -946,13 +946,13 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
break; break;
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -977,7 +977,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $this; return $this;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function power() } // function power()
@ -996,12 +996,12 @@ class PHPExcel_Shared_JAMA_Matrix {
switch($match) { switch($match) {
case 'object': case 'object':
if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); } if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
case 'array': case 'array':
$M = new PHPExcel_Shared_JAMA_Matrix($args[0]); $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
break; break;
default: default:
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
break; break;
} }
$this->checkMatrixDimensions($M); $this->checkMatrixDimensions($M);
@ -1012,7 +1012,7 @@ class PHPExcel_Shared_JAMA_Matrix {
} }
return $this; return $this;
} else { } else {
throw new Exception(self::PolymorphicArgumentException); throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
} }
} // function concat() } // function concat()

6
Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
View File

@ -88,7 +88,7 @@ class PHPExcel_Shared_JAMA_QRDecomposition {
$this->Rdiag[$k] = -$nrm; $this->Rdiag[$k] = -$nrm;
} }
} else { } else {
throw new Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException); throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
} }
} // function __construct() } // function __construct()
@ -224,10 +224,10 @@ class PHPExcel_Shared_JAMA_QRDecomposition {
$X = new PHPExcel_Shared_JAMA_Matrix($X); $X = new PHPExcel_Shared_JAMA_Matrix($X);
return ($X->getMatrix(0, $this->n-1, 0, $nx)); return ($X->getMatrix(0, $this->n-1, 0, $nx));
} else { } else {
throw new Exception(self::MatrixRankException); throw new PHPExcel_Calculation_Exception(self::MatrixRankException);
} }
} else { } else {
throw new Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException); throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
} }
} // function solve() } // function solve()

2
Classes/PHPExcel/Shared/JAMA/utils/Maths.php
View File

@ -35,7 +35,7 @@ function hypot() {
if (is_numeric($d)) { if (is_numeric($d)) {
$s += pow($d, 2); $s += pow($d, 2);
} else { } else {
throw new Exception(JAMAError(ArgumentTypeException)); throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
} }
} }
return sqrt($s); return sqrt($s);

6
Classes/PHPExcel/Shared/OLE.php
View File

@ -97,18 +97,18 @@ class PHPExcel_Shared_OLE
{ {
$fh = fopen($file, "r"); $fh = fopen($file, "r");
if (!$fh) { if (!$fh) {
throw new Exception("Can't open file $file"); throw new PHPExcel_Reader_Exception("Can't open file $file");
} }
$this->_file_handle = $fh; $this->_file_handle = $fh;
$signature = fread($fh, 8); $signature = fread($fh, 8);
if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) { if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) {
throw new Exception("File doesn't seem to be an OLE container."); throw new PHPExcel_Reader_Exception("File doesn't seem to be an OLE container.");
} }
fseek($fh, 28); fseek($fh, 28);
if (fread($fh, 2) != "\xFE\xFF") { if (fread($fh, 2) != "\xFE\xFF") {
// This shouldn't be a problem in practice // This shouldn't be a problem in practice
throw new Exception("Only Little-Endian encoding is supported."); throw new PHPExcel_Reader_Exception("Only Little-Endian encoding is supported.");
} }
// Size of blocks and short blocks in bytes // Size of blocks and short blocks in bytes
$this->bigBlockSize = pow(2, self::_readInt2($fh)); $this->bigBlockSize = pow(2, self::_readInt2($fh));

4
Classes/PHPExcel/Shared/OLE/PPS/Root.php
View File

@ -84,13 +84,13 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root"); $this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
$this->_FILEH_ = fopen($this->_tmp_filename,"w+b"); $this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
if ($this->_FILEH_ == false) { if ($this->_FILEH_ == false) {
throw new Exception("Can't create temporary file."); throw new PHPExcel_Writer_Exception("Can't create temporary file.");
} }
} else { } else {
$this->_FILEH_ = fopen($filename, "wb"); $this->_FILEH_ = fopen($filename, "wb");
} }
if ($this->_FILEH_ == false) { if ($this->_FILEH_ == false) {
throw new Exception("Can't open $filename. It may be in use or protected."); throw new PHPExcel_Writer_Exception("Can't open $filename. It may be in use or protected.");
} }
// Make an array of PPS's (for Save) // Make an array of PPS's (for Save)
$aList = array(); $aList = array();

2
Classes/PHPExcel/Shared/ZipArchive.php
View File

@ -105,7 +105,7 @@ class PHPExcel_Shared_ZipArchive
PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"] PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]
); );
if ($res == 0) { if ($res == 0) {
throw new Exception("Error zipping files : " . $this->_zip->errorInfo(true)); throw new PHPExcel_Writer_Exception("Error zipping files : " . $this->_zip->errorInfo(true));
} }
unlink($this->_tempDir.'/'.$filenameParts["basename"]); unlink($this->_tempDir.'/'.$filenameParts["basename"]);

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

@ -82,7 +82,7 @@ class PHPExcel_Shared_ZipStreamWrapper {
public function stream_open($path, $mode, $options, &$opened_path) { public function stream_open($path, $mode, $options, &$opened_path) {
// Check for mode // Check for mode
if ($mode{0} != 'r') { if ($mode{0} != 'r') {
throw new Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.'); throw new PHPExcel_Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
} }
$pos = strrpos($path, '#'); $pos = strrpos($path, '#');

4
Classes/PHPExcel/Style.php
View File

@ -192,7 +192,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @param boolean $pAdvanced Advanced mode for setting borders. * @param boolean $pAdvanced Advanced mode for setting borders.
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style * @return PHPExcel_Style
*/ */
public function applyFromArray($pStyles = null, $pAdvanced = true) { public function applyFromArray($pStyles = null, $pAdvanced = true) {
@ -464,7 +464,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
} }
} else { } else {
throw new Exception("Invalid style array passed."); throw new PHPExcel_Exception("Invalid style array passed.");
} }
return $this; return $this;
} }

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

@ -238,7 +238,7 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* Set Style * Set Style
* *
* @param PHPExcel_Style $pValue * @param PHPExcel_Style $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setStyle(PHPExcel_Style $pValue = null) { public function setStyle(PHPExcel_Style $pValue = null) {

98
Classes/PHPExcel/Worksheet.php
View File

@ -552,7 +552,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param string $index Chart index position * @param string $index Chart index position
* @return false|PHPExcel_Chart * @return false|PHPExcel_Chart
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getChartByIndex($index = null) public function getChartByIndex($index = null)
{ {
@ -574,7 +574,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Return an array of the names of charts on this worksheet * Return an array of the names of charts on this worksheet
* *
* @return string[] The names of charts * @return string[] The names of charts
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getChartNames() public function getChartNames()
{ {
@ -590,7 +590,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param string $chartName Chart name * @param string $chartName Chart name
* @return false|PHPExcel_Chart * @return false|PHPExcel_Chart
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getChartByName($chartName = '') public function getChartByName($chartName = '')
{ {
@ -1197,7 +1197,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (!$namedRange->getLocalOnly()) { if (!$namedRange->getLocalOnly()) {
return $namedRange->getWorksheet()->cellExists($pCoordinate); return $namedRange->getWorksheet()->cellExists($pCoordinate);
} else { } else {
throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle()); throw new PHPExcel_Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
} }
} }
} }
@ -1299,7 +1299,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @deprecated * @deprecated
* @return PHPExcel_Style * @return PHPExcel_Style
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getDefaultStyle() public function getDefaultStyle()
{ {
@ -1311,7 +1311,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @deprecated * @deprecated
* @param PHPExcel_Style $pValue * @param PHPExcel_Style $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setDefaultStyle(PHPExcel_Style $pValue) public function setDefaultStyle(PHPExcel_Style $pValue)
@ -1330,7 +1330,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param string $pCellCoordinate Cell coordinate to get style for * @param string $pCellCoordinate Cell coordinate to get style for
* @return PHPExcel_Style * @return PHPExcel_Style
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getStyle($pCellCoordinate = 'A1') public function getStyle($pCellCoordinate = 'A1')
{ {
@ -1426,7 +1426,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @deprecated * @deprecated
* @param PHPExcel_Style $pSharedCellStyle Cell style to share * @param PHPExcel_Style $pSharedCellStyle Cell style to share
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1") * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '') public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
@ -1442,7 +1442,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param PHPExcel_Style $pCellStyle Cell style to duplicate * @param PHPExcel_Style $pCellStyle Cell style to duplicate
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1") * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '') public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '')
@ -1566,7 +1566,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1") * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
* @param boolean $pAdvanced Advanced mode for setting borders. * @param boolean $pAdvanced Advanced mode for setting borders.
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true) public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true)
@ -1624,7 +1624,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set merge on a cell range * Set merge on a cell range
* *
* @param string $pRange Cell range (e.g. A1:E1) * @param string $pRange Cell range (e.g. A1:E1)
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function mergeCells($pRange = 'A1:A1') public function mergeCells($pRange = 'A1:A1')
@ -1653,7 +1653,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
} }
} else { } else {
throw new Exception('Merge must be set on a range of cells.'); throw new PHPExcel_Exception('Merge must be set on a range of cells.');
} }
return $this; return $this;
@ -1666,7 +1666,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow1 Numeric row coordinate of the first cell * @param int $pRow1 Numeric row coordinate of the first cell
* @param int $pColumn2 Numeric column coordinate of the last cell * @param int $pColumn2 Numeric column coordinate of the last cell
* @param int $pRow2 Numeric row coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1) public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
@ -1679,7 +1679,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Remove merge on a cell range * Remove merge on a cell range
* *
* @param string $pRange Cell range (e.g. A1:E1) * @param string $pRange Cell range (e.g. A1:E1)
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function unmergeCells($pRange = 'A1:A1') public function unmergeCells($pRange = 'A1:A1')
@ -1691,10 +1691,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (isset($this->_mergeCells[$pRange])) { if (isset($this->_mergeCells[$pRange])) {
unset($this->_mergeCells[$pRange]); unset($this->_mergeCells[$pRange]);
} else { } else {
throw new Exception('Cell range ' . $pRange . ' not known as merged.'); throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as merged.');
} }
} else { } else {
throw new Exception('Merge can only be removed from a range of cells.'); throw new PHPExcel_Exception('Merge can only be removed from a range of cells.');
} }
return $this; return $this;
@ -1707,7 +1707,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow1 Numeric row coordinate of the first cell * @param int $pRow1 Numeric row coordinate of the first cell
* @param int $pColumn2 Numeric column coordinate of the last cell * @param int $pColumn2 Numeric column coordinate of the last cell
* @param int $pRow2 Numeric row coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1) public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
@ -1745,7 +1745,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1) * @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
* @param string $pPassword Password to unlock the protection * @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false) public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false)
@ -1770,7 +1770,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow2 Numeric row coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell
* @param string $pPassword Password to unlock the protection * @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false) public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
@ -1783,7 +1783,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Remove protection on a cell range * Remove protection on a cell range
* *
* @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1) * @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function unprotectCells($pRange = 'A1') public function unprotectCells($pRange = 'A1')
@ -1794,7 +1794,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (isset($this->_protectedCells[$pRange])) { if (isset($this->_protectedCells[$pRange])) {
unset($this->_protectedCells[$pRange]); unset($this->_protectedCells[$pRange]);
} else { } else {
throw new Exception('Cell range ' . $pRange . ' not known as protected.'); throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as protected.');
} }
return $this; return $this;
} }
@ -1808,7 +1808,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow2 Numeric row coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell
* @param string $pPassword Password to unlock the protection * @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false) public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
@ -1842,7 +1842,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param PHPExcel_Worksheet_AutoFilter|string $pValue * @param PHPExcel_Worksheet_AutoFilter|string $pValue
* A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setAutoFilter($pValue) public function setAutoFilter($pValue)
@ -1862,7 +1862,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow1 Numeric row coordinate of the first cell * @param int $pRow1 Numeric row coordinate of the first cell
* @param int $pColumn2 Numeric column coordinate of the second cell * @param int $pColumn2 Numeric column coordinate of the second cell
* @param int $pRow2 Numeric row coordinate of the second cell * @param int $pRow2 Numeric row coordinate of the second cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1) public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
@ -1904,7 +1904,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* B1 will freeze the columns to the left of cell B1 (i.e column A) * B1 will freeze the columns to the left of cell B1 (i.e column A)
* B2 will freeze the rows above and to the left of cell A2 * B2 will freeze the rows above and to the left of cell A2
* (i.e row 1 and column A) * (i.e row 1 and column A)
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function freezePane($pCell = '') public function freezePane($pCell = '')
@ -1915,7 +1915,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (strpos($pCell,':') === false && strpos($pCell,',') === false) { if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
$this->_freezePane = $pCell; $this->_freezePane = $pCell;
} else { } else {
throw new Exception('Freeze pane can not be set on a range of cells.'); throw new PHPExcel_Exception('Freeze pane can not be set on a range of cells.');
} }
return $this; return $this;
} }
@ -1925,7 +1925,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pColumn Numeric column coordinate of the cell * @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell * @param int $pRow Numeric row coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1) public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
@ -1948,7 +1948,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pBefore Insert before this one * @param int $pBefore Insert before this one
* @param int $pNumRows Number of rows to insert * @param int $pNumRows Number of rows to insert
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) { public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
@ -1956,7 +1956,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance(); $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this); $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
} else { } else {
throw new Exception("Rows can only be inserted before at least row 1."); throw new PHPExcel_Exception("Rows can only be inserted before at least row 1.");
} }
return $this; return $this;
} }
@ -1966,7 +1966,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pBefore Insert before this one * @param int $pBefore Insert before this one
* @param int $pNumCols Number of columns to insert * @param int $pNumCols Number of columns to insert
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) { public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
@ -1974,7 +1974,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance(); $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this); $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
} else { } else {
throw new Exception("Column references should not be numeric."); throw new PHPExcel_Exception("Column references should not be numeric.");
} }
return $this; return $this;
} }
@ -1984,14 +1984,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pBefore Insert before this one (numeric column coordinate of the cell) * @param int $pBefore Insert before this one (numeric column coordinate of the cell)
* @param int $pNumCols Number of columns to insert * @param int $pNumCols Number of columns to insert
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) { public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) {
if ($pBefore >= 0) { if ($pBefore >= 0) {
return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols); return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
} else { } else {
throw new Exception("Columns can only be inserted before at least column A (0)."); throw new PHPExcel_Exception("Columns can only be inserted before at least column A (0).");
} }
} }
@ -2000,7 +2000,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pRow Remove starting with this one * @param int $pRow Remove starting with this one
* @param int $pNumRows Number of rows to remove * @param int $pNumRows Number of rows to remove
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function removeRow($pRow = 1, $pNumRows = 1) { public function removeRow($pRow = 1, $pNumRows = 1) {
@ -2008,7 +2008,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance(); $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this); $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
} else { } else {
throw new Exception("Rows to be deleted should at least start from row 1."); throw new PHPExcel_Exception("Rows to be deleted should at least start from row 1.");
} }
return $this; return $this;
} }
@ -2018,7 +2018,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pColumn Remove starting with this one * @param int $pColumn Remove starting with this one
* @param int $pNumCols Number of columns to remove * @param int $pNumCols Number of columns to remove
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function removeColumn($pColumn = 'A', $pNumCols = 1) { public function removeColumn($pColumn = 'A', $pNumCols = 1) {
@ -2027,7 +2027,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance(); $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this); $objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
} else { } else {
throw new Exception("Column references should not be numeric."); throw new PHPExcel_Exception("Column references should not be numeric.");
} }
return $this; return $this;
} }
@ -2037,14 +2037,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pColumn Remove starting with this one (numeric column coordinate of the cell) * @param int $pColumn Remove starting with this one (numeric column coordinate of the cell)
* @param int $pNumCols Number of columns to remove * @param int $pNumCols Number of columns to remove
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) { public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) {
if ($pColumn >= 0) { if ($pColumn >= 0) {
return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols); return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
} else { } else {
throw new Exception("Columns to be deleted should at least start from column 0"); throw new PHPExcel_Exception("Columns to be deleted should at least start from column 0");
} }
} }
@ -2176,7 +2176,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param string $pCellCoordinate Cell coordinate to get comment for * @param string $pCellCoordinate Cell coordinate to get comment for
* @return PHPExcel_Comment * @return PHPExcel_Comment
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function getComment($pCellCoordinate = 'A1') public function getComment($pCellCoordinate = 'A1')
{ {
@ -2184,11 +2184,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pCellCoordinate = strtoupper($pCellCoordinate); $pCellCoordinate = strtoupper($pCellCoordinate);
if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) { if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
throw new Exception('Cell coordinate string can not be a range of cells.'); throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells.');
} else if (strpos($pCellCoordinate,'$') !== false) { } else if (strpos($pCellCoordinate,'$') !== false) {
throw new Exception('Cell coordinate string must not be absolute.'); throw new PHPExcel_Exception('Cell coordinate string must not be absolute.');
} else if ($pCellCoordinate == '') { } else if ($pCellCoordinate == '') {
throw new Exception('Cell coordinate can not be zero-length string.'); throw new PHPExcel_Exception('Cell coordinate can not be zero-length string.');
} else { } else {
// Check if we already have a comment for this cell. // Check if we already have a comment for this cell.
// If not, create a new comment. // If not, create a new comment.
@ -2260,7 +2260,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Select a range of cells. * Select a range of cells.
* *
* @param string $pCoordinate Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6' * @param string $pCoordinate Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setSelectedCells($pCoordinate = 'A1') public function setSelectedCells($pCoordinate = 'A1')
@ -2295,7 +2295,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* *
* @param int $pColumn Numeric column coordinate of the cell * @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell * @param int $pRow Numeric row coordinate of the cell
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1) public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
@ -2330,7 +2330,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param mixed $nullValue Value in source array that stands for blank cell * @param mixed $nullValue Value in source array that stands for blank cell
* @param string $startCell Insert array starting from this cell address as the top left coordinate * @param string $startCell Insert array starting from this cell address as the top left coordinate
* @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array * @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) { public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
@ -2363,7 +2363,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
++$startRow; ++$startRow;
} }
} else { } else {
throw new Exception("Parameter \$source should be an array."); throw new PHPExcel_Exception("Parameter \$source should be an array.");
} }
return $this; return $this;
} }
@ -2444,7 +2444,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
* True - Return rows and columns indexed by their actual row and column IDs * True - Return rows and columns indexed by their actual row and column IDs
* @return array * @return array
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) { public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
$namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this); $namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
@ -2456,7 +2456,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$nullValue, $calculateFormulas, $formatData, $returnCellRef); $nullValue, $calculateFormulas, $formatData, $returnCellRef);
} }
throw new Exception('Named Range '.$pNamedRange.' does not exist.'); throw new PHPExcel_Exception('Named Range '.$pNamedRange.' does not exist.');
} }

10
Classes/PHPExcel/Worksheet/AutoFilter/Column.php
View File

@ -134,7 +134,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Column Index * Set AutoFilter Column Index
* *
* @param string $pColumn Column (e.g. A) * @param string $pColumn Column (e.g. A)
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setColumnIndex($pColumn) { public function setColumnIndex($pColumn) {
@ -183,7 +183,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Type * Set AutoFilter Type
* *
* @param string $pFilterType * @param string $pFilterType
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) { public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) {
@ -209,7 +209,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Multiple Rules And/Or * Set AutoFilter Multiple Rules And/Or
* *
* @param string $pJoin And/Or * @param string $pJoin And/Or
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) { public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) {
@ -228,7 +228,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Attributes * Set AutoFilter Attributes
* *
* @param string[] $pAttributes * @param string[] $pAttributes
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setAttributes($pAttributes = array()) { public function setAttributes($pAttributes = array()) {
@ -242,7 +242,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* *
* @param string $pName Attribute Name * @param string $pName Attribute Name
* @param string $pValue Attribute Value * @param string $pValue Attribute Value
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setAttribute($pName, $pValue) { public function setAttribute($pName, $pValue) {

10
Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
View File

@ -288,7 +288,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Type * Set AutoFilter Rule Type
* *
* @param string $pRuleType * @param string $pRuleType
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column * @return PHPExcel_Worksheet_AutoFilter_Column
*/ */
public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) { public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) {
@ -314,7 +314,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Value * Set AutoFilter Rule Value
* *
* @param string|string[] $pValue * @param string|string[] $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column_Rule * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
*/ */
public function setValue($pValue = '') { public function setValue($pValue = '') {
@ -354,7 +354,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Operator * Set AutoFilter Rule Operator
* *
* @param string $pOperator * @param string $pOperator
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column_Rule * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
*/ */
public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) { public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) {
@ -382,7 +382,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Grouping * Set AutoFilter Rule Grouping
* *
* @param string $pGrouping * @param string $pGrouping
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column_Rule * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
*/ */
public function setGrouping($pGrouping = NULL) { public function setGrouping($pGrouping = NULL) {
@ -404,7 +404,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* @param string $pOperator * @param string $pOperator
* @param string|string[] $pValue * @param string|string[] $pValue
* @param string $pGrouping * @param string $pGrouping
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_AutoFilter_Column_Rule * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
*/ */
public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) { public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) {

6
Classes/PHPExcel/Worksheet/BaseDrawing.php
View File

@ -212,7 +212,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* *
* @param PHPExcel_Worksheet $pValue * @param PHPExcel_Worksheet $pValue
* @param bool $pOverrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet? * @param bool $pOverrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_BaseDrawing * @return PHPExcel_Worksheet_BaseDrawing
*/ */
public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) { public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
@ -237,7 +237,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
// Set new PHPExcel_Worksheet // Set new PHPExcel_Worksheet
$this->setWorksheet($pValue); $this->setWorksheet($pValue);
} else { } else {
throw new Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet."); throw new PHPExcel_Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
} }
} }
return $this; return $this;
@ -440,7 +440,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Shadow * Set Shadow
* *
* @param PHPExcel_Worksheet_Drawing_Shadow $pValue * @param PHPExcel_Worksheet_Drawing_Shadow $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_BaseDrawing * @return PHPExcel_Worksheet_BaseDrawing
*/ */
public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) { public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {

4
Classes/PHPExcel/Worksheet/ColumnDimension.php
View File

@ -195,12 +195,12 @@ class PHPExcel_Worksheet_ColumnDimension
* Value must be between 0 and 7 * Value must be between 0 and 7
* *
* @param int $pValue * @param int $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_ColumnDimension * @return PHPExcel_Worksheet_ColumnDimension
*/ */
public function setOutlineLevel($pValue) { public function setOutlineLevel($pValue) {
if ($pValue < 0 || $pValue > 7) { if ($pValue < 0 || $pValue > 7) {
throw new Exception("Outline level must range between 0 and 7."); throw new PHPExcel_Exception("Outline level must range between 0 and 7.");
} }
$this->_outlineLevel = $pValue; $this->_outlineLevel = $pValue;

4
Classes/PHPExcel/Worksheet/Drawing.php
View File

@ -98,7 +98,7 @@ class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implemen
* *
* @param string $pValue File path * @param string $pValue File path
* @param boolean $pVerifyFile Verify file * @param boolean $pVerifyFile Verify file
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_Drawing * @return PHPExcel_Worksheet_Drawing
*/ */
public function setPath($pValue = '', $pVerifyFile = true) { public function setPath($pValue = '', $pVerifyFile = true) {
@ -111,7 +111,7 @@ class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implemen
list($this->_width, $this->_height) = getimagesize($pValue); list($this->_width, $this->_height) = getimagesize($pValue);
} }
} else { } else {
throw new Exception("File $pValue not found!"); throw new PHPExcel_Exception("File $pValue not found!");
} }
} else { } else {
$this->_path = $pValue; $this->_path = $pValue;

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

@ -226,7 +226,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Color * Set Color
* *
* @param PHPExcel_Style_Color $pValue * @param PHPExcel_Style_Color $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_Drawing_Shadow * @return PHPExcel_Worksheet_Drawing_Shadow
*/ */
public function setColor(PHPExcel_Style_Color $pValue = null) { public function setColor(PHPExcel_Style_Color $pValue = null) {

8
Classes/PHPExcel/Worksheet/HeaderFooter.php
View File

@ -392,7 +392,7 @@ class PHPExcel_Worksheet_HeaderFooter
* *
* @param PHPExcel_Worksheet_HeaderFooterDrawing $image * @param PHPExcel_Worksheet_HeaderFooterDrawing $image
* @param string $location * @param string $location
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_HeaderFooter * @return PHPExcel_Worksheet_HeaderFooter
*/ */
public function addImage(PHPExcel_Worksheet_HeaderFooterDrawing $image = null, $location = self::IMAGE_HEADER_LEFT) { public function addImage(PHPExcel_Worksheet_HeaderFooterDrawing $image = null, $location = self::IMAGE_HEADER_LEFT) {
@ -404,7 +404,7 @@ class PHPExcel_Worksheet_HeaderFooter
* Remove header/footer image * Remove header/footer image
* *
* @param string $location * @param string $location
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_HeaderFooter * @return PHPExcel_Worksheet_HeaderFooter
*/ */
public function removeImage($location = self::IMAGE_HEADER_LEFT) { public function removeImage($location = self::IMAGE_HEADER_LEFT) {
@ -418,12 +418,12 @@ class PHPExcel_Worksheet_HeaderFooter
* Set header/footer images * Set header/footer images
* *
* @param PHPExcel_Worksheet_HeaderFooterDrawing[] $images * @param PHPExcel_Worksheet_HeaderFooterDrawing[] $images
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_HeaderFooter * @return PHPExcel_Worksheet_HeaderFooter
*/ */
public function setImages($images) { public function setImages($images) {
if (!is_array($images)) { if (!is_array($images)) {
throw new Exception('Invalid parameter!'); throw new PHPExcel_Exception('Invalid parameter!');
} }
$this->_headerFooterImages = $images; $this->_headerFooterImages = $images;

4
Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
View File

@ -296,7 +296,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* *
* @param string $pValue File path * @param string $pValue File path
* @param boolean $pVerifyFile Verify file * @param boolean $pVerifyFile Verify file
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_HeaderFooterDrawing * @return PHPExcel_Worksheet_HeaderFooterDrawing
*/ */
public function setPath($pValue = '', $pVerifyFile = true) { public function setPath($pValue = '', $pVerifyFile = true) {
@ -309,7 +309,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
list($this->_width, $this->_height) = getimagesize($pValue); list($this->_width, $this->_height) = getimagesize($pValue);
} }
} else { } else {
throw new Exception("File $pValue not found!"); throw new PHPExcel_Exception("File $pValue not found!");
} }
} else { } else {
$this->_path = $pValue; $this->_path = $pValue;

28
Classes/PHPExcel/Worksheet/PageSetup.php
View File

@ -339,7 +339,7 @@ class PHPExcel_Worksheet_PageSetup
* @param int? $pValue * @param int? $pValue
* @param boolean $pUpdate Update fitToPage so scaling applies rather than fitToHeight / fitToWidth * @param boolean $pUpdate Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
* @return PHPExcel_Worksheet_PageSetup * @return PHPExcel_Worksheet_PageSetup
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function setScale($pValue = 100, $pUpdate = true) { public function setScale($pValue = 100, $pUpdate = true) {
// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface, // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
@ -350,7 +350,7 @@ class PHPExcel_Worksheet_PageSetup
$this->_fitToPage = false; $this->_fitToPage = false;
} }
} else { } else {
throw new Exception("Scale must not be negative"); throw new PHPExcel_Exception("Scale must not be negative");
} }
return $this; return $this;
} }
@ -568,7 +568,7 @@ class PHPExcel_Worksheet_PageSetup
* Default behaviour, or a index value of 0, will return all ranges as a comma-separated string * Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
* Otherwise, the specific range identified by the value of $index will be returned * Otherwise, the specific range identified by the value of $index will be returned
* Print areas are numbered from 1 * Print areas are numbered from 1
* @throws Exception * @throws PHPExcel_Exception
* @return string * @return string
*/ */
public function getPrintArea($index = 0) { public function getPrintArea($index = 0) {
@ -579,7 +579,7 @@ class PHPExcel_Worksheet_PageSetup
if (isset($printAreas[$index-1])) { if (isset($printAreas[$index-1])) {
return $printAreas[$index-1]; return $printAreas[$index-1];
} }
throw new Exception("Requested Print Area does not exist"); throw new PHPExcel_Exception("Requested Print Area does not exist");
} }
/** /**
@ -640,15 +640,15 @@ class PHPExcel_Worksheet_PageSetup
* Default behaviour, or the "O" method, overwrites existing print area * Default behaviour, or the "O" method, overwrites existing print area
* The "I" method, inserts the new print area before any specified index, or at the end of the list * The "I" method, inserts the new print area before any specified index, or at the end of the list
* @return PHPExcel_Worksheet_PageSetup * @return PHPExcel_Worksheet_PageSetup
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) { public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) {
if (strpos($value,'!') !== false) { if (strpos($value,'!') !== false) {
throw new Exception('Cell coordinate must not specify a worksheet.'); throw new PHPExcel_Exception('Cell coordinate must not specify a worksheet.');
} elseif (strpos($value,':') === false) { } elseif (strpos($value,':') === false) {
throw new Exception('Cell coordinate must be a range of cells.'); throw new PHPExcel_Exception('Cell coordinate must be a range of cells.');
} elseif (strpos($value,'$') !== false) { } elseif (strpos($value,'$') !== false) {
throw new Exception('Cell coordinate must not be absolute.'); throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
} }
$value = strtoupper($value); $value = strtoupper($value);
@ -661,7 +661,7 @@ class PHPExcel_Worksheet_PageSetup
$index = count($printAreas) - abs($index) + 1; $index = count($printAreas) - abs($index) + 1;
} }
if (($index <= 0) || ($index > count($printAreas))) { if (($index <= 0) || ($index > count($printAreas))) {
throw new Exception('Invalid index for setting print range.'); throw new PHPExcel_Exception('Invalid index for setting print range.');
} }
$printAreas[$index-1] = $value; $printAreas[$index-1] = $value;
$this->_printArea = implode(',',$printAreas); $this->_printArea = implode(',',$printAreas);
@ -675,13 +675,13 @@ class PHPExcel_Worksheet_PageSetup
$index = abs($index) - 1; $index = abs($index) - 1;
} }
if ($index > count($printAreas)) { if ($index > count($printAreas)) {
throw new Exception('Invalid index for setting print range.'); throw new PHPExcel_Exception('Invalid index for setting print range.');
} }
$printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index)); $printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index));
$this->_printArea = implode(',',$printAreas); $this->_printArea = implode(',',$printAreas);
} }
} else { } else {
throw new Exception('Invalid method for setting print range.'); throw new PHPExcel_Exception('Invalid method for setting print range.');
} }
return $this; return $this;
@ -698,7 +698,7 @@ class PHPExcel_Worksheet_PageSetup
* list. * list.
* Print areas are numbered from 1 * Print areas are numbered from 1
* @return PHPExcel_Worksheet_PageSetup * @return PHPExcel_Worksheet_PageSetup
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addPrintArea($value, $index = -1) { public function addPrintArea($value, $index = -1) {
return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT); return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
@ -725,7 +725,7 @@ class PHPExcel_Worksheet_PageSetup
* Default behaviour, or the "O" method, overwrites existing print area * Default behaviour, or the "O" method, overwrites existing print area
* The "I" method, inserts the new print area before any specified index, or at the end of the list * The "I" method, inserts the new print area before any specified index, or at the end of the list
* @return PHPExcel_Worksheet_PageSetup * @return PHPExcel_Worksheet_PageSetup
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
{ {
@ -746,7 +746,7 @@ class PHPExcel_Worksheet_PageSetup
* list. * list.
* Print areas are numbered from 1 * Print areas are numbered from 1
* @return PHPExcel_Worksheet_PageSetup * @return PHPExcel_Worksheet_PageSetup
* @throws Exception * @throws PHPExcel_Exception
*/ */
public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1) public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
{ {

4
Classes/PHPExcel/Worksheet/RowDimension.php
View File

@ -195,12 +195,12 @@ class PHPExcel_Worksheet_RowDimension
* Value must be between 0 and 7 * Value must be between 0 and 7
* *
* @param int $pValue * @param int $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_RowDimension * @return PHPExcel_Worksheet_RowDimension
*/ */
public function setOutlineLevel($pValue) { public function setOutlineLevel($pValue) {
if ($pValue < 0 || $pValue > 7) { if ($pValue < 0 || $pValue > 7) {
throw new Exception("Outline level must range between 0 and 7."); throw new PHPExcel_Exception("Outline level must range between 0 and 7.");
} }
$this->_outlineLevel = $pValue; $this->_outlineLevel = $pValue;

12
Classes/PHPExcel/Worksheet/SheetView.php
View File

@ -96,7 +96,7 @@ class PHPExcel_Worksheet_SheetView
* Valid values range from 10 to 400. * Valid values range from 10 to 400.
* *
* @param int $pValue * @param int $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_SheetView * @return PHPExcel_Worksheet_SheetView
*/ */
public function setZoomScale($pValue = 100) { public function setZoomScale($pValue = 100) {
@ -105,7 +105,7 @@ class PHPExcel_Worksheet_SheetView
if (($pValue >= 1) || is_null($pValue)) { if (($pValue >= 1) || is_null($pValue)) {
$this->_zoomScale = $pValue; $this->_zoomScale = $pValue;
} else { } else {
throw new Exception("Scale must be greater than or equal to 1."); throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
} }
return $this; return $this;
} }
@ -125,14 +125,14 @@ class PHPExcel_Worksheet_SheetView
* Valid values range from 10 to 400. * Valid values range from 10 to 400.
* *
* @param int $pValue * @param int $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_SheetView * @return PHPExcel_Worksheet_SheetView
*/ */
public function setZoomScaleNormal($pValue = 100) { public function setZoomScaleNormal($pValue = 100) {
if (($pValue >= 1) || is_null($pValue)) { if (($pValue >= 1) || is_null($pValue)) {
$this->_zoomScaleNormal = $pValue; $this->_zoomScaleNormal = $pValue;
} else { } else {
throw new Exception("Scale must be greater than or equal to 1."); throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
} }
return $this; return $this;
} }
@ -155,7 +155,7 @@ class PHPExcel_Worksheet_SheetView
* 'pageBreakPreview' self::SHEETVIEW_PAGE_BREAK_PREVIEW * 'pageBreakPreview' self::SHEETVIEW_PAGE_BREAK_PREVIEW
* *
* @param string $pValue * @param string $pValue
* @throws Exception * @throws PHPExcel_Exception
* @return PHPExcel_Worksheet_SheetView * @return PHPExcel_Worksheet_SheetView
*/ */
public function setView($pValue = NULL) { public function setView($pValue = NULL) {
@ -166,7 +166,7 @@ class PHPExcel_Worksheet_SheetView
if (in_array($pValue, self::$_sheetViewTypes)) { if (in_array($pValue, self::$_sheetViewTypes)) {
$this->_sheetviewType = $pValue; $this->_sheetviewType = $pValue;
} else { } else {
throw new Exception("Invalid sheetview layout type."); throw new PHPExcel_Exception("Invalid sheetview layout type.");
} }
return $this; return $this;

2
Classes/PHPExcel/Writer/Abstract.php
View File

@ -131,7 +131,7 @@ abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
* *
* @param boolean $pValue * @param boolean $pValue
* @param string $pDirectory Disk caching directory * @param string $pDirectory Disk caching directory
* @throws PHPExcel_Writer_Exception Exception when directory does not exist * @throws PHPExcel_Writer_Exception when directory does not exist
* @return PHPExcel_Writer_Excel2007 * @return PHPExcel_Writer_Excel2007
*/ */
public function setUseDiskCaching($pValue = FALSE, $pDirectory = NULL) { public function setUseDiskCaching($pValue = FALSE, $pDirectory = NULL) {

2
Classes/PHPExcel/Writer/Excel5.php
View File

@ -234,7 +234,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
* *
* @deprecated * @deprecated
* @param string $pValue Temporary storage directory * @param string $pValue Temporary storage directory
* @throws PHPExcel_Writer_Exception Exception when directory does not exist * @throws PHPExcel_Writer_Exception when directory does not exist
* @return PHPExcel_Writer_Excel5 * @return PHPExcel_Writer_Excel5
*/ */
public function setTempDir($pValue = '') { public function setTempDir($pValue = '') {

2
Classes/PHPExcel/Writer/Excel5/Workbook.php
View File

@ -688,7 +688,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
} }
$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false)); $chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
} catch(Exception $e) { } catch(PHPExcel_Exception $e) {
// do nothing // do nothing
} }
} }

58
Classes/PHPExcel/Writer/Excel5/Worksheet.php
View File

@ -478,19 +478,19 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Write WINDOW2 record // Write WINDOW2 record
$this->_writeWindow2(); $this->_writeWindow2();
// Write PLV record // Write PLV record
$this->_writePageLayoutView(); $this->_writePageLayoutView();
// Write ZOOM record // Write ZOOM record
$this->_writeZoom(); $this->_writeZoom();
if ($_phpSheet->getFreezePane()) { if ($_phpSheet->getFreezePane()) {
$this->_writePanes(); $this->_writePanes();
} }
// Write SELECTION record // Write SELECTION record
$this->_writeSelection(); $this->_writeSelection();
// Write MergedCellsTable Record // Write MergedCellsTable Record
$this->_writeMergedCells(); $this->_writeMergedCells();
@ -518,11 +518,11 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$this->_writeDataValidity(); $this->_writeDataValidity();
$this->_writeSheetLayout(); $this->_writeSheetLayout();
// Write SHEETPROTECTION record // Write SHEETPROTECTION record
$this->_writeSheetProtection(); $this->_writeSheetProtection();
$this->_writeRangeProtection(); $this->_writeRangeProtection();
$arrConditionalStyles = $_phpSheet->getConditionalStylesCollection(); $arrConditionalStyles = $_phpSheet->getConditionalStylesCollection();
if(!empty($arrConditionalStyles)){ if(!empty($arrConditionalStyles)){
$arrConditional = array(); $arrConditional = array();
@ -543,7 +543,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
} }
} }
} }
$this->_storeEof(); $this->_storeEof();
} }
@ -934,7 +934,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
return 0; return 0;
} catch (Exception $e) { } catch (PHPExcel_Exception $e) {
// do nothing // do nothing
} }
@ -2931,7 +2931,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$formula1 = $this->_parser->toReversePolish(); $formula1 = $this->_parser->toReversePolish();
$sz1 = strlen($formula1); $sz1 = strlen($formula1);
} catch(PHPExcel_Writer_Exception $e) { } catch(PHPExcel_Exception $e) {
$sz1 = 0; $sz1 = 0;
$formula1 = ''; $formula1 = '';
} }
@ -2948,7 +2948,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$formula2 = $this->_parser->toReversePolish(); $formula2 = $this->_parser->toReversePolish();
$sz2 = strlen($formula2); $sz2 = strlen($formula2);
} catch(PHPExcel_Writer_Exception $e) { } catch(PHPExcel_Exception $e) {
$sz2 = 0; $sz2 = 0;
$formula2 = ''; $formula2 = '';
} }
@ -3016,14 +3016,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$data = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit); $data = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
$this->_append($header . $data); $this->_append($header . $data);
} }
/** /**
* Write CFRule Record * Write CFRule Record
* @param PHPExcel_Style_Conditional $conditional * @param PHPExcel_Style_Conditional $conditional
*/ */
private function _writeCFRule(PHPExcel_Style_Conditional $conditional){ private function _writeCFRule(PHPExcel_Style_Conditional $conditional){
$record = 0x01B1; // Record identifier $record = 0x01B1; // Record identifier
// $type : Type of the CF // $type : Type of the CF
// $operatorType : Comparison operator // $operatorType : Comparison operator
if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION){ if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION){
@ -3031,7 +3031,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$operatorType = 0x00; $operatorType = 0x00;
} else if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){ } else if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
$type = 0x01; $type = 0x01;
switch ($conditional->getOperatorType()){ switch ($conditional->getOperatorType()){
case PHPExcel_Style_Conditional::OPERATOR_NONE: case PHPExcel_Style_Conditional::OPERATOR_NONE:
$operatorType = 0x00; $operatorType = 0x00;
@ -3060,7 +3060,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// not OPERATOR_NOTBETWEEN 0x02 // not OPERATOR_NOTBETWEEN 0x02
} }
} }
// $szValue1 : size of the formula data for first value or formula // $szValue1 : size of the formula data for first value or formula
// $szValue2 : size of the formula data for second value or formula // $szValue2 : size of the formula data for second value or formula
$arrConditions = $conditional->getConditions(); $arrConditions = $conditional->getConditions();
@ -3074,14 +3074,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000); $szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
$szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000); $szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000);
$operand1 = pack('Cv', 0x1E, $arrConditions[0]); $operand1 = pack('Cv', 0x1E, $arrConditions[0]);
$operand2 = pack('Cv', 0x1E, $arrConditions[1]); $operand2 = pack('Cv', 0x1E, $arrConditions[1]);
} else { } else {
$szValue1 = 0x0000; $szValue1 = 0x0000;
$szValue2 = 0x0000; $szValue2 = 0x0000;
$operand1 = null; $operand1 = null;
$operand2 = null; $operand2 = null;
} }
// $flags : Option flags // $flags : Option flags
// Alignment // Alignment
$bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() == null ? 1 : 0); $bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() == null ? 1 : 0);
@ -3169,7 +3169,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$flags |= (1 == 1 ? 0x00380000 : 0); $flags |= (1 == 1 ? 0x00380000 : 0);
// Font // Font
$flags |= (1 == $bFormatFont ? 0x04000000 : 0); $flags |= (1 == $bFormatFont ? 0x04000000 : 0);
// Alignment : // Alignment :
$flags |= (1 == $bFormatAlign ? 0x08000000 : 0); $flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
// Border // Border
$flags |= (1 == $bFormatBorder ? 0x10000000 : 0); $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
@ -3179,7 +3179,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$flags |= (1 == $bFormatProt ? 0x40000000 : 0); $flags |= (1 == $bFormatProt ? 0x40000000 : 0);
// Text direction // Text direction
$flags |= (1 == 0 ? 0x80000000 : 0); $flags |= (1 == 0 ? 0x80000000 : 0);
// Data Blocks // Data Blocks
if($bFormatFont == 1){ if($bFormatFont == 1){
// Font Name // Font Name
@ -3258,7 +3258,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
case '800080': $colorIdx = 0x24; break; case '800080': $colorIdx = 0x24; break;
case '800000': $colorIdx = 0x25; break; case '800000': $colorIdx = 0x25; break;
case '008080': $colorIdx = 0x26; break; case '008080': $colorIdx = 0x26; break;
case '0000FF': $colorIdx = 0x27; break; case '0000FF': $colorIdx = 0x27; break;
case '00CCFF': $colorIdx = 0x28; break; case '00CCFF': $colorIdx = 0x28; break;
case 'CCFFFF': $colorIdx = 0x29; break; case 'CCFFFF': $colorIdx = 0x29; break;
case 'CCFFCC': $colorIdx = 0x2A; break; case 'CCFFCC': $colorIdx = 0x2A; break;
@ -3333,10 +3333,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY : $blockAlign = 3 << 4; break; case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY : $blockAlign = 3 << 4; break;
} }
$blockAlign |= 0 << 7; $blockAlign |= 0 << 7;
// Text rotation angle // Text rotation angle
$blockRotation = $conditional->getStyle()->getAlignment()->getTextRotation(); $blockRotation = $conditional->getStyle()->getAlignment()->getTextRotation();
// Indentation // Indentation
$blockIndent = $conditional->getStyle()->getAlignment()->getIndent(); $blockIndent = $conditional->getStyle()->getAlignment()->getIndent();
if($conditional->getStyle()->getAlignment()->getShrinkToFit() == true){ if($conditional->getStyle()->getAlignment()->getShrinkToFit() == true){
@ -3345,10 +3345,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$blockIndent |= 0 << 4; $blockIndent |= 0 << 4;
} }
$blockIndent |= 0 << 6; $blockIndent |= 0 << 6;
// Relative indentation // Relative indentation
$blockIndentRelative = 255; $blockIndentRelative = 255;
$dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000); $dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
} }
if($bFormatBorder == 1){ if($bFormatBorder == 1){
@ -3602,7 +3602,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$dataBlockProtection = 1 << 1; $dataBlockProtection = 1 << 1;
} }
} }
$data = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000); $data = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000);
if($bFormatFont == 1){ // Block Formatting : OK if($bFormatFont == 1){ // Block Formatting : OK
$data .= $dataBlockFont; $data .= $dataBlockFont;
@ -3635,7 +3635,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
private function _writeCFHeader(){ private function _writeCFHeader(){
$record = 0x01B0; // Record identifier $record = 0x01B0; // Record identifier
$length = 0x0016; // Bytes to follow $length = 0x0016; // Bytes to follow
$numColumnMin = null; $numColumnMin = null;
$numColumnMax = null; $numColumnMax = null;
$numRowMin = null; $numRowMin = null;
@ -3668,9 +3668,9 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
} }
} }
} }
$needRedraw = 1; $needRedraw = 1;
$cellRange = pack('vvvv', $numRowMin-1, $numRowMax-1, $numColumnMin-1, $numColumnMax-1); $cellRange = pack('vvvv', $numRowMin-1, $numRowMax-1, $numColumnMin-1, $numColumnMax-1);
$header = pack('vv', $record, $length); $header = pack('vv', $record, $length);
$data = pack('vv', count($arrConditional), $needRedraw); $data = pack('vv', count($arrConditional), $needRedraw);
$data .= $cellRange; $data .= $cellRange;

2
Classes/PHPExcel/Writer/Exception.php
View File

@ -33,7 +33,7 @@
* @package PHPExcel_Writer * @package PHPExcel_Writer
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
*/ */
class PHPExcel_Writer_Exception extends Exception { class PHPExcel_Writer_Exception extends PHPExcel_Exception {
/** /**
* Error handler callback * Error handler callback
* *

2
Classes/PHPExcel/Writer/PDF.php
View File

@ -42,7 +42,7 @@ class PHPExcel_Writer_PDF
* Instantiate a new renderer of the configured type within this container class * Instantiate a new renderer of the configured type within this container class
* *
* @param PHPExcel $phpExcel PHPExcel object * @param PHPExcel $phpExcel PHPExcel object
* @throws PHPExcel_Writer_Exception Exception when PDF library is not configured * @throws PHPExcel_Writer_Exception when PDF library is not configured
*/ */
public function __construct(PHPExcel $phpExcel) public function __construct(PHPExcel $phpExcel)
{ {

2
Classes/PHPExcel/Writer/PDF/Core.php
View File

@ -306,7 +306,7 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Set temporary storage directory * Set temporary storage directory
* *
* @param string $pValue Temporary storage directory * @param string $pValue Temporary storage directory
* @throws PHPExcel_Writer_Exception Exception when directory does not exist * @throws PHPExcel_Writer_Exception when directory does not exist
* @return PHPExcel_Writer_PDF * @return PHPExcel_Writer_PDF
*/ */
public function setTempDir($pValue = '') public function setTempDir($pValue = '')

BIN
Documentation/PHPExcel User Documentation - Reading Spreadsheet Files.doc
View File

Binary file not shown.

3
changelog.txt
View File

@ -38,7 +38,8 @@ Fixed in develop branch:
- General: (amironov ) Work item GH-84 - Search style by identity in PHPExcel_Worksheet::duplicateStyle() - General: (amironov ) Work item GH-84 - Search style by identity in PHPExcel_Worksheet::duplicateStyle()
- General: (karak) Work item GH-85 - Fill SheetView IO in Excel5 - General: (karak) Work item GH-85 - Fill SheetView IO in Excel5
- General: (cfhay) Work item 18958 - Memory and Speed improvements in PHPExcel_Reader_Excel5 - General: (cfhay) Work item 18958 - Memory and Speed improvements in PHPExcel_Reader_Excel5
- General: (MBaker) Modify listWorksheetNames() and listWorksheetInfo to use XMLReader with streamed XML rather than SimpleXML - General: (MBaker) Work item GH-78 - Modify listWorksheetNames() and listWorksheetInfo to use XMLReader with streamed XML rather than SimpleXML
- General: (dbonsch) Restructuring of PHPExcel Exceptions
- Bugfix: (techhead) Work item GH-70 - Fixed formula/formatting bug when removing rows - 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: (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 - Bugfix: (MBaker) Work item 18844 - cache_in_memory_gzip "eats" last worksheet line, cache_in_memory doesn't