summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-01-20 19:21:55 +0100
committerKohei Yoshida <libreoffice@kohei.us>2014-01-20 23:16:53 +0000
commite1f9f700203d8a3b7f0f7b14a7816a939e98d1d5 (patch)
tree51db1be719c4234df2f69a4666897de9fcb37391 /sc
parentd43b1244c867f39829ee8807eb67bf9d3d67fef1 (diff)
resolved fdo#73836 do not apply format twice to string
ScDocument::GetString() already returns the formatted string that then was formatted through number formatter. Format raw string instead. (cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9) Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd Reviewed-on: https://gerrit.libreoffice.org/7553 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/cellform.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index bc65f9199a39..0893149ca078 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -143,14 +143,16 @@ OUString ScCellFormat::GetString(
{
case CELLTYPE_STRING:
{
- OUString aCellString = rDoc.GetString(rPos);
- rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor, bUseStarFormat);
+ ScRefCellValue aCell;
+ aCell.assign(rDoc, rPos);
+ rFormatter.GetOutputString(aCell.getString(&rDoc), nFormat, aString, ppColor, bUseStarFormat);
}
break;
case CELLTYPE_EDIT:
{
- OUString aCellString = rDoc.GetString(rPos);
- rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor);
+ ScRefCellValue aCell;
+ aCell.assign(rDoc, rPos);
+ rFormatter.GetOutputString(aCell.getString(&rDoc), nFormat, aString, ppColor);
}
break;
case CELLTYPE_VALUE: