From e1f9f700203d8a3b7f0f7b14a7816a939e98d1d5 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 20 Jan 2014 19:21:55 +0100 Subject: 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 Tested-by: Kohei Yoshida --- sc/source/core/tool/cellform.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sc') 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: -- cgit v1.2.3