diff options
| author | Eike Rathke <erack@redhat.com> | 2014-01-20 19:21:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 10:54:22 +0000 |
| commit | b00aee5aa776c99940d858a8b73557612a558d01 (patch) | |
| tree | 71c58dd7f8480e06042b67f3f8cbe4d3a7d80c99 | |
| parent | cfcf7d267c5b3535c40b8394f53126b45a7898a4 (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/7554
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/core/tool/cellform.cxx | 10 |
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: |