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

Merge pull request #432 from driebit/fix-undefined-offset 

Improve sheet index error handling
This commit is contained in:
Progi1984 2014-09-08 19:09:23 +02:00
parent 280620a753 fdfd36cc04
commit b56bcb980b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Classes/PHPExcel.php
View File

@ -461,10 +461,12 @@ class PHPExcel
* Get active sheet * Get active sheet
* *
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*
* @throws PHPExcel_Exception
*/ */
public function getActiveSheet() public function getActiveSheet()
{ {
return $this->_workSheetCollection[$this->_activeSheetIndex]; return $this->getSheet($this->_activeSheetIndex);
} }
/** /**
@ -570,16 +572,14 @@ class PHPExcel
*/ */
public function getSheet($pIndex = 0) public function getSheet($pIndex = 0)
{ {
if (!isset($this->_workSheetCollection[$pIndex])) {
$numSheets = count($this->_workSheetCollection); $numSheets = $this->getSheetCount();
if ($pIndex > $numSheets - 1) {
throw new PHPExcel_Exception( throw new PHPExcel_Exception(
"Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}." "Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
); );
} else {
return $this->_workSheetCollection[$pIndex];
} }
return $this->_workSheetCollection[$pIndex];
} }
/** /**
@ -682,7 +682,7 @@ class PHPExcel
*/ */
public function setActiveSheetIndex($pIndex = 0) public function setActiveSheetIndex($pIndex = 0)
{ {
$numSheets = count($this->_workSheetCollection); $numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) { if ($pIndex > $numSheets - 1) {
throw new PHPExcel_Exception( throw new PHPExcel_Exception(