From 0924d0a4ca50d7ef418dac2cb9f31a580bdb5ac0 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Wed, 14 Dec 2011 23:00:45 +0000
Subject: [PATCH] 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
---
Classes/PHPExcel/Cell.php | 6 +++---
changelog.txt | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Classes/PHPExcel/Cell.php b/Classes/PHPExcel/Cell.php
index 1fd865e..87b5f02 100644
--- a/Classes/PHPExcel/Cell.php
+++ b/Classes/PHPExcel/Cell.php
@@ -201,9 +201,9 @@ class PHPExcel_Cell
*/
public function getFormattedValue()
{
- return PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
- $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
- );
+ return (string) PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
+ $this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
+ );
}
/**
diff --git a/changelog.txt b/changelog.txt
index ea0a0a2..ba62c8b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -45,6 +45,7 @@ Fixed in SVN:
- 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: (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 15461 - Locale file paths not fit for windows
- General: (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM