From a6f00db9c68b96430177e962b82dad3e59255f9f Mon Sep 17 00:00:00 2001 From: Alexander Pervakov Date: Fri, 30 May 2014 14:37:11 +0400 Subject: [PATCH] Change the getter/setter for zeroHeight to camel case --- Classes/PHPExcel/Reader/Excel2007.php | 6 +++--- Classes/PHPExcel/Worksheet/RowDimension.php | 4 ++-- Classes/PHPExcel/Writer/Excel2007/Worksheet.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/PHPExcel/Reader/Excel2007.php b/Classes/PHPExcel/Reader/Excel2007.php index 105904c6..7647d58d 100644 --- a/Classes/PHPExcel/Reader/Excel2007.php +++ b/Classes/PHPExcel/Reader/Excel2007.php @@ -478,7 +478,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE $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) @@ -756,7 +756,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE } if (isset($xmlSheet->sheetFormatPr['zeroHeight']) && ((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) { - $docSheet->getDefaultRowDimension()->setzeroHeight(true); + $docSheet->getDefaultRowDimension()->setZeroHeight(true); } } @@ -1984,7 +1984,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE $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'; diff --git a/Classes/PHPExcel/Worksheet/RowDimension.php b/Classes/PHPExcel/Worksheet/RowDimension.php index 93535f55..bff89a08 100644 --- a/Classes/PHPExcel/Worksheet/RowDimension.php +++ b/Classes/PHPExcel/Worksheet/RowDimension.php @@ -145,7 +145,7 @@ class PHPExcel_Worksheet_RowDimension * * @return bool */ - public function getzeroHeight() { + public function getZeroHeight() { return $this->_zeroHeight; } @@ -155,7 +155,7 @@ class PHPExcel_Worksheet_RowDimension * @param bool $pValue * @return PHPExcel_Worksheet_RowDimension */ - public function setzeroHeight($pValue = false) { + public function setZeroHeight($pValue = false) { $this->_zeroHeight = $pValue; return $this; } diff --git a/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/Classes/PHPExcel/Writer/Excel2007/Worksheet.php index 76058164..5cb803e5 100644 --- a/Classes/PHPExcel/Writer/Excel2007/Worksheet.php +++ b/Classes/PHPExcel/Writer/Excel2007/Worksheet.php @@ -326,8 +326,8 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ } // 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'); }