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

Commit 23479fd

Browse files
author
Mark Baker
committed
Merge pull request #379 from frost-nzcr4/ft-camelcase
Change the getter/setter for zeroHeight to camel case
2 parents 2a06bc9 + a6f00db commit 23479fd

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Classes/PHPExcel/Reader/Excel2007.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ public function load($pFilename)
479479
$macros = $customUI = NULL;
480480
foreach ($relsWorkbook->Relationship as $ele) {
481481
switch($ele['Type']){
482-
case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
482+
case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
483483
$worksheets[(string) $ele["Id"]] = $ele["Target"];
484484
break;
485485
// a vbaProject ? (: some macros)
@@ -757,7 +757,7 @@ public function load($pFilename)
757757
}
758758
if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
759759
((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
760-
$docSheet->getDefaultRowDimension()->setzeroHeight(true);
760+
$docSheet->getDefaultRowDimension()->setZeroHeight(true);
761761
}
762762
}
763763

@@ -1986,7 +1986,7 @@ private function _readRibbon($excel, $customUITarget, $zip)
19861986
$nameCustomUI = basename($customUITarget);
19871987
// get the xml file (ribbon)
19881988
$localRibbon = $this->_getFromZipArchive($zip, $customUITarget);
1989-
$customUIImagesNames = array();
1989+
$customUIImagesNames = array();
19901990
$customUIImagesBinaries = array();
19911991
// something like customUI/_rels/customUI.xml.rels
19921992
$pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';

Classes/PHPExcel/Worksheet/RowDimension.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function setRowHeight($pValue = -1) {
145145
*
146146
* @return bool
147147
*/
148-
public function getzeroHeight() {
148+
public function getZeroHeight() {
149149
return $this->_zeroHeight;
150150
}
151151

@@ -155,7 +155,7 @@ public function getzeroHeight() {
155155
* @param bool $pValue
156156
* @return PHPExcel_Worksheet_RowDimension
157157
*/
158-
public function setzeroHeight($pValue = false) {
158+
public function setZeroHeight($pValue = false) {
159159
$this->_zeroHeight = $pValue;
160160
return $this;
161161
}

Classes/PHPExcel/Writer/Excel2007/Worksheet.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ private function _writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null
326326
}
327327

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

0 commit comments

Comments
 (0)