This commit is contained in:
Dominik Bonsch 2013-02-09 12:17:58 +01:00
parent caced1a5be
commit 4771c30ef1

View File

@ -195,7 +195,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style * @return PHPExcel_Style
*/ */
public function applyFromArray($pStyles = null, $pAdvanced = true) { public function applyFromArray($pStyles = null, $pAdvanced = true)
{
if (is_array($pStyles)) { if (is_array($pStyles)) {
if ($this->_isSupervisor) { if ($this->_isSupervisor) {
@ -474,7 +475,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function getFill() { public function getFill()
{
return $this->_fill; return $this->_fill;
} }
@ -483,7 +485,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Font * @return PHPExcel_Style_Font
*/ */
public function getFont() { public function getFont()
{
return $this->_font; return $this->_font;
} }
@ -504,7 +507,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Borders * @return PHPExcel_Style_Borders
*/ */
public function getBorders() { public function getBorders()
{
return $this->_borders; return $this->_borders;
} }
@ -513,7 +517,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function getAlignment() { public function getAlignment()
{
return $this->_alignment; return $this->_alignment;
} }
@ -522,7 +527,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_NumberFormat * @return PHPExcel_Style_NumberFormat
*/ */
public function getNumberFormat() { public function getNumberFormat()
{
return $this->_numberFormat; return $this->_numberFormat;
} }
@ -531,7 +537,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Conditional[] * @return PHPExcel_Style_Conditional[]
*/ */
public function getConditionalStyles() { public function getConditionalStyles()
{
return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell()); return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
} }
@ -541,7 +548,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* @param PHPExcel_Style_Conditional[] $pValue Array of condtional styles * @param PHPExcel_Style_Conditional[] $pValue Array of condtional styles
* @return PHPExcel_Style * @return PHPExcel_Style
*/ */
public function setConditionalStyles($pValue = null) { public function setConditionalStyles($pValue = null)
{
if (is_array($pValue)) { if (is_array($pValue)) {
$this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue); $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
} }
@ -553,7 +561,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return PHPExcel_Style_Protection * @return PHPExcel_Style_Protection
*/ */
public function getProtection() { public function getProtection()
{
return $this->_protection; return $this->_protection;
} }
@ -562,7 +571,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @return string Hash code * @return string Hash code
*/ */
public function getHashCode() { public function getHashCode()
{
$hashConditionals = ''; $hashConditionals = '';
foreach ($this->_conditionalStyles as $conditional) { foreach ($this->_conditionalStyles as $conditional) {
$hashConditionals .= $conditional->getHashCode(); $hashConditionals .= $conditional->getHashCode();