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

Merge pull request #379 from frost-nzcr4/ft-camelcase 

Change the getter/setter for zeroHeight to camel case
This commit is contained in:
Mark Baker 2014-07-27 12:21:13 +01:00
parent 2a06bc9675 a6f00db9c6
commit 23479fdde2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Reader/Excel2007.php
View File

@ -479,7 +479,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
$macros = $customUI = NULL; $macros = $customUI = NULL;
foreach ($relsWorkbook->Relationship as $ele) { foreach ($relsWorkbook->Relationship as $ele) {
switch($ele['Type']){ 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"]; $worksheets[(string) $ele["Id"]] = $ele["Target"];
break; break;
// a vbaProject ? (: some macros) // a vbaProject ? (: some macros)
@ -757,7 +757,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
} }
if (isset($xmlSheet->sheetFormatPr['zeroHeight']) && if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) { ((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
$docSheet->getDefaultRowDimension()->setzeroHeight(true); $docSheet->getDefaultRowDimension()->setZeroHeight(true);
} }
} }
@ -1986,7 +1986,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
$nameCustomUI = basename($customUITarget); $nameCustomUI = basename($customUITarget);
// get the xml file (ribbon) // get the xml file (ribbon)
$localRibbon = $this->_getFromZipArchive($zip, $customUITarget); $localRibbon = $this->_getFromZipArchive($zip, $customUITarget);
$customUIImagesNames = array(); $customUIImagesNames = array();
$customUIImagesBinaries = array(); $customUIImagesBinaries = array();
// something like customUI/_rels/customUI.xml.rels // something like customUI/_rels/customUI.xml.rels
$pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels'; $pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';

4
Classes/PHPExcel/Worksheet/RowDimension.php
View File

@ -145,7 +145,7 @@ class PHPExcel_Worksheet_RowDimension
* *
* @return bool * @return bool
*/ */
public function getzeroHeight() { public function getZeroHeight() {
return $this->_zeroHeight; return $this->_zeroHeight;
} }
@ -155,7 +155,7 @@ class PHPExcel_Worksheet_RowDimension
* @param bool $pValue * @param bool $pValue
* @return PHPExcel_Worksheet_RowDimension * @return PHPExcel_Worksheet_RowDimension
*/ */
public function setzeroHeight($pValue = false) { public function setZeroHeight($pValue = false) {
$this->_zeroHeight = $pValue; $this->_zeroHeight = $pValue;
return $this; return $this;
} }

4
Classes/PHPExcel/Writer/Excel2007/Worksheet.php
View File

@ -326,8 +326,8 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
} }
// Set Zero Height row // Set Zero Height row
if ((string)$pSheet->getDefaultRowDimension()->getzeroHeight() == '1' || if ((string)$pSheet->getDefaultRowDimension()->getZeroHeight() == '1' ||
strtolower((string)$pSheet->getDefaultRowDimension()->getzeroHeight()) == 'true' ) { strtolower((string)$pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true' ) {
$objWriter->writeAttribute('zeroHeight', '1'); $objWriter->writeAttribute('zeroHeight', '1');
} }