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

Bugfix: (fauvel) Work item 16958 - Cell::getFormattedValue returns RichText object instead of string 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@83890 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-12-14 23:00:45 +00:00
parent 7fce476f0c
commit 0924d0a4ca
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Cell.php
View File

@ -201,9 +201,9 @@ class PHPExcel_Cell
*/ */
public function getFormattedValue() public function getFormattedValue()
{ {
return PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(), return (string) PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
$this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode() $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
); );
} }
/** /**

1
changelog.txt
View File

@ -45,6 +45,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Work item 16956 - External links in Excel2010 files cause Fatal error - Bugfix: (MBaker) Work item 16956 - External links in Excel2010 files cause Fatal error
- Bugfix: (MBaker) Work item 16960 - Previous calculation engine error conditions trigger cyclic reference errors - Bugfix: (MBaker) Work item 16960 - Previous calculation engine error conditions trigger cyclic reference errors
- Bugfix: (mkopinsky) Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode - Bugfix: (mkopinsky) Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode
- Bugfix: (fauvel) Work item 16958 - Cell::getFormattedValue returns RichText object instead of string
- General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC) - General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
- General: (MBaker) Work item 15461 - Locale file paths not fit for windows - General: (MBaker) Work item 15461 - Locale file paths not fit for windows
- General: (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM - General: (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM