Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop

This commit is contained in:
Mark Baker 2013-05-10 20:09:26 +01:00
commit c6c99bd990
3 changed files with 20 additions and 9 deletions

View File

@ -912,6 +912,17 @@ class PHPExcel_Cell
self::$_valueBinder = $binder;
}
/**
* Get style for cell
*
* @return PHPExcel_Style
* @throws PHPExcel_Exception
*/
public function getStyle()
{
return $this->getWorksheet()->getParent()->getCellXfByIndex($this->getXfIndex());
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/

View File

@ -36,13 +36,13 @@
class PHPExcel_Worksheet implements PHPExcel_IComparable
{
/* Break types */
const BREAK_NONE = 0;
const BREAK_ROW = 1;
const BREAK_COLUMN = 2;
const BREAK_NONE = 0;
const BREAK_ROW = 1;
const BREAK_COLUMN = 2;
/* Sheet state */
const SHEETSTATE_VISIBLE = 'visible';
const SHEETSTATE_HIDDEN = 'hidden';
const SHEETSTATE_HIDDEN = 'hidden';
const SHEETSTATE_VERYHIDDEN = 'veryHidden';
/**