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

Manual PR merge to remove redundant brackets after throw in 2 files, courtesy of kachkaev

This commit is contained in:
Mark Baker 2013-05-15 18:02:24 +01:00
parent 6a4be7da3c
commit 9f575aff68
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Calculation.php
View File

@ -2209,7 +2209,7 @@ class PHPExcel_Calculation {
try { try {
return $this->calculateCellValue($pCell); return $this->calculateCellValue($pCell);
} catch (PHPExcel_Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new PHPExcel_Calculation_Exception($e->getMessage())); throw new PHPExcel_Calculation_Exception($e->getMessage());
} }
} // function calculate() } // function calculate()
@ -2243,7 +2243,7 @@ class PHPExcel_Calculation {
try { try {
$result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell)); $result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
} catch (PHPExcel_Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new PHPExcel_Calculation_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)) {
@ -2323,7 +2323,7 @@ class PHPExcel_Calculation {
try { try {
$result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell)); $result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
} catch (PHPExcel_Exception $e) { } catch (PHPExcel_Exception $e) {
throw(new PHPExcel_Calculation_Exception($e->getMessage())); throw new PHPExcel_Calculation_Exception($e->getMessage());
} }
// Reset calculation cacheing to its previous state // Reset calculation cacheing to its previous state

6
Classes/PHPExcel/Cell.php
View File

@ -295,10 +295,8 @@ class PHPExcel_Cell
} }
//echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL; //echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
$result = '#N/A'; $result = '#N/A';
throw( throw new PHPExcel_Calculation_Exception(
new PHPExcel_Calculation_Exception( $this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
$this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
)
); );
} }