Skip to content
This repository has been archived by the owner on Jan 2, 2019. It is now read-only.

Change the getter/setter for zeroHeight to camel case #379

Merged
merged 1 commit into from
Jul 27, 2014
Merged

Change the getter/setter for zeroHeight to camel case #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Classes/PHPExcel/Reader/Excel2007.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ public function load($pFilename)
$macros = $customUI = NULL;
foreach ($relsWorkbook->Relationship as $ele) {
switch($ele['Type']){
case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
$worksheets[(string) $ele["Id"]] = $ele["Target"];
break;
// a vbaProject ? (: some macros)
Expand Down Expand Up @@ -756,7 +756,7 @@ public function load($pFilename)
}
if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
$docSheet->getDefaultRowDimension()->setzeroHeight(true);
$docSheet->getDefaultRowDimension()->setZeroHeight(true);
}
}

Expand Down Expand Up @@ -1984,7 +1984,7 @@ private function _readRibbon($excel, $customUITarget, $zip)
$nameCustomUI = basename($customUITarget);
// get the xml file (ribbon)
$localRibbon = $this->_getFromZipArchive($zip, $customUITarget);
$customUIImagesNames = array();
$customUIImagesNames = array();
$customUIImagesBinaries = array();
// something like customUI/_rels/customUI.xml.rels
$pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';
Expand Down
4 changes: 2 additions & 2 deletions Classes/PHPExcel/Worksheet/RowDimension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function setRowHeight($pValue = -1) {
*
* @return bool
*/
public function getzeroHeight() {
public function getZeroHeight() {
return $this->_zeroHeight;
}

Expand All @@ -155,7 +155,7 @@ public function getzeroHeight() {
* @param bool $pValue
* @return PHPExcel_Worksheet_RowDimension
*/
public function setzeroHeight($pValue = false) {
public function setZeroHeight($pValue = false) {
$this->_zeroHeight = $pValue;
return $this;
}
Expand Down
4 changes: 2 additions & 2 deletions Classes/PHPExcel/Writer/Excel2007/Worksheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ private function _writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null
}

// Set Zero Height row
if ((string)$pSheet->getDefaultRowDimension()->getzeroHeight() == '1' ||
strtolower((string)$pSheet->getDefaultRowDimension()->getzeroHeight()) == 'true' ) {
if ((string)$pSheet->getDefaultRowDimension()->getZeroHeight() == '1' ||
strtolower((string)$pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true' ) {
$objWriter->writeAttribute('zeroHeight', '1');
}

Expand Down