General: (dresenhista) Work Item GH-242 - Functionality to getHighestRow() for a specified column, and getHighestColumn() for a specified row

This commit is contained in:
Mark Baker 2013-11-09 00:40:59 +00:00
parent 2bbe908e77
commit 13a98ef631
2 changed files with 39 additions and 9 deletions

View File

@ -254,23 +254,52 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
/** /**
* Get highest worksheet column * Get highest worksheet column
* *
* @return string Highest column name * @param string $row Return the highest column for the specified row,
* or the highest column of any row if no row number is passed
* @return string Highest column name
*/ */
public function getHighestColumn() public function getHighestColumn($row = null)
{ {
$colRow = $this->getHighestRowAndColumn(); if ($row == null) {
return $colRow['column']; $colRow = $this->getHighestRowAndColumn();
} return $colRow['column'];
}
$columnList = array(1);
foreach ($this->getCellList() as $coord) {
sscanf($coord,'%[A-Z]%d', $c, $r);
if ($r != $row) {
continue;
}
$columnList[] = PHPExcel_Cell::columnIndexFromString($c);
}
return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
}
/** /**
* Get highest worksheet row * Get highest worksheet row
* *
* @return int Highest row number * @param string $column Return the highest row for the specified column,
* or the highest row of any column if no column letter is passed
* @return int Highest row number
*/ */
public function getHighestRow() public function getHighestRow($column = null)
{ {
$colRow = $this->getHighestRowAndColumn(); if ($column == null) {
return $colRow['row']; $colRow = $this->getHighestRowAndColumn();
return $colRow['row'];
}
$rowList = array(0);
foreach ($this->getCellList() as $coord) {
sscanf($coord,'%[A-Z]%d', $c, $r);
if ($c != $column) {
continue;
}
$rowList[] = $r;
}
return max($rowList);
} }

View File

@ -41,6 +41,7 @@ Fixed in develop branch for release v1.8.0:
- General: (MBaker) - Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load if it's actually required - General: (MBaker) - Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load if it's actually required
- General: (MBaker) - Modified Excel2007 Writer to default preCalculateFormulas to false - General: (MBaker) - Modified Excel2007 Writer to default preCalculateFormulas to false
Note that autosize columns will still recalculate affected formulae internally Note that autosize columns will still recalculate affected formulae internally
- General: (dresenhista) Work Item GH-242 - Functionality to getHighestRow() for a specified column, and getHighestColumn() for a specified row
Fixed in develop branch for release v1.7.9: Fixed in develop branch for release v1.7.9: