PHPOfficeGh-78 replaced Exception with PHPExcel_Exception in all Cell…

… classes
dbonsch · Nov 19, 2012 · 10c3ba8 · 10c3ba8
1 parent 13a9413
commit 10c3ba8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Classes/PHPExcel/Cell.php b/Classes/PHPExcel/Cell.php
@@ -296,7 +296,7 @@ public function getCalculatedValue($resetLog = TRUE)
 //				echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />';
 				$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog);
 //				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)) {
 //					echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
 					return $this->_calculatedValue; // Fallback for calculations referencing external files.
@@ -727,7 +727,7 @@ public static function getRangeBoundaries($pRange = 'A1:A1')
 	 *
 	 *	@param	string $pString
 	 *	@return	int Column index (base 1 !!!)
-	 *	@throws	Exception
+	 *	@throws	PHPExcel_Exception
 	 */
 	public static function columnIndexFromString($pString = 'A')
 	{
@@ -894,11 +894,11 @@ public static function getValueBinder() {
 	 * Set value binder to use
 	 *
 	 * @param PHPExcel_Cell_IValueBinder $binder
-	 * @throws Exception
+	 * @throws PHPExcel_Exception
 	 */
 	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = NULL) {
 		if ($binder === NULL) {
-			throw new Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
+			throw new PHPExcel_Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
 		}
 
 		self::$_valueBinder = $binder;

diff --git a/Classes/PHPExcel/Cell/DataValidation.php b/Classes/PHPExcel/Cell/DataValidation.php
@@ -154,7 +154,7 @@ class PHPExcel_Cell_DataValidation
     /**
      * Create a new PHPExcel_Cell_DataValidation
      *
-     * @throws	Exception
+     * @throws	PHPExcel_Exception
      */
     public function __construct()
     {

diff --git a/Classes/PHPExcel/Cell/Hyperlink.php b/Classes/PHPExcel/Cell/Hyperlink.php
@@ -54,7 +54,7 @@ class PHPExcel_Cell_Hyperlink
      *
      * @param 	string				$pUrl		Url to link the cell to
      * @param	string				$pTooltip	Tooltip to display on the hyperlink
-     * @throws	Exception
+     * @throws	PHPExcel_Exception
      */
     public function __construct($pUrl = '', $pTooltip = '')
     {