[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Eike Rathke]

 sc/source/core/tool/cellform.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5eb37896ca344276cc0753ad93b822d7be9b21d6
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jan 20 19:21:55 2014 +0100

    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.
    
    Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd
    (cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9)
    Reviewed-on: https://gerrit.libreoffice.org/7549
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 434043f..6a23ba2 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -144,14 +144,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.mpString->getString(), 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: