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

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
parent 69dc096fe7 04c1608f3f
commit c6c99bd990
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Classes/PHPExcel/Cell.php
View File

@ -912,6 +912,17 @@ class PHPExcel_Cell
self::$_valueBinder = $binder; 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. * Implement PHP __clone to create a deep clone, not just a shallow copy.
*/ */

8
Classes/PHPExcel/Worksheet.php
View File

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

10
changelog.txt
View File

@ -64,7 +64,7 @@ Fixed in develop branch for release v1.7.9:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
BREAKING CHANGE! As part of the planned changes for handling array formulae in BREAKING CHANGE! As part of the planned changes for handling array formulae in
workbooks, there are some changes that will affect the PHPExcel_Cell object workbooks, there are some changes that will affect the PHPExcel_Cell object
methods. methods.
The following methods are now deprecated, and will be removed in or after version 1.8.0: The following methods are now deprecated, and will be removed in or after version 1.8.0:
@ -82,13 +82,13 @@ The following methods will be added in version 1.8.0
value if the cell doesn't contain a formula, or value if the cell doesn't contain a formula, or
is not part of an array formula range. is not part of an array formula range.
setFormula() Use to set a cell formula. It will still be possible setFormula() Use to set a cell formula. It will still be possible
to set formulae using the setValue() and to set formulae using the setValue() and
setValueExplicit() methods. setValueExplicit() methods.
calculate() Use to execute a formula calculation to update the calculate() Use to execute a formula calculation to update the
cell value. cell value.
isFormula() Use to determine if a cell contains a formula, or is isFormula() Use to determine if a cell contains a formula, or is
part of an array formula range or not. part of an array formula range or not.
isArrayFormula() Use to determine if a cell contains an array formula, isArrayFormula() Use to determine if a cell contains an array formula,
or is part of an array formula range or not. or is part of an array formula range or not.
getArrayFormulaRange() Use to retrieve an array formula range. getArrayFormulaRange() Use to retrieve an array formula range.
@ -99,7 +99,7 @@ The following methods will be changed in version 1.8.0
setValueExplicit() The logic behind this will be modified to store setValueExplicit() The logic behind this will be modified to store
formula values in the new cell property structure, formula values in the new cell property structure,
but it will still perform the same function. but it will still perform the same function.
getValue() Will no longer return a formula if the cell contains getValue() Will no longer return a formula if the cell contains
a formula, but will return the calculated value a formula, but will return the calculated value
instead. For cells that don't contain a formula, instead. For cells that don't contain a formula,
it will still return the stored value. it will still return the stored value.
@ -179,7 +179,7 @@ The following methods will be changed in version 1.8.0
- General: (MBaker) Reduce cell caching overhead using dirty flag to ensure that cells are only rewritten to the cache if they have actually been changed - General: (MBaker) Reduce cell caching overhead using dirty flag to ensure that cells are only rewritten to the cache if they have actually been changed
- General: (MBaker) Improved memory usage in CSV Writer - General: (MBaker) Improved memory usage in CSV Writer
- General: (MBaker) Improved speed and memory usage in Excel5 Writer - General: (MBaker) Improved speed and memory usage in Excel5 Writer
- General: (MBaker) Experimental - - General: (MBaker) Experimental -
Added getHighestDataColumn(), getHighestDataRow(), getHighestRowAndColumn() and calculateWorksheetDataDimension() methods for the worksheet that return the highest row and column that have cell records Added getHighestDataColumn(), getHighestDataRow(), getHighestRowAndColumn() and calculateWorksheetDataDimension() methods for the worksheet that return the highest row and column that have cell records
- General: (MBaker) Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL - General: (MBaker) Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL
- Bugfix: (MBaker) Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer - Bugfix: (MBaker) Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer