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

Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop

This commit is contained in:
MarkBaker 2014-09-10 00:00:11 +01:00
parent d4a641c5c7 b56bcb980b
commit 4baab36319
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
*
* @return PHPExcel_Worksheet
*
* @throws PHPExcel_Exception
*/
public function getActiveSheet()
{
return $this->_workSheetCollection[$this->_activeSheetIndex];
return $this->getSheet($this->_activeSheetIndex);
}
/**
@ -570,16 +572,14 @@ class PHPExcel
*/
public function getSheet($pIndex = 0)
{
$numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) {
if (!isset($this->_workSheetCollection[$pIndex])) {
$numSheets = $this->getSheetCount();
throw new PHPExcel_Exception(
"Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
);
} else {
return $this->_workSheetCollection[$pIndex];
"Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
);
}
return $this->_workSheetCollection[$pIndex];
}
/**
@ -682,7 +682,7 @@ class PHPExcel
*/
public function setActiveSheetIndex($pIndex = 0)
{
$numSheets = count($this->_workSheetCollection);
$numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) {
throw new PHPExcel_Exception(