[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source

[Tamás Zolnai]

 sc/source/core/data/dpcache.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 94109b88446b93ac2a092daf8a66986456e54725
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Fri Oct 6 22:27:31 2017 +0200

    tdf#112884: Error string is displayed as empty item in pivot table
    
    Need to get the right string representation of error cells.
    
    Based on the code it seems a regression from:
    d4cd8677889ec3807c194ef5b462f8e031807e5b
    
    Reviewed-on: https://gerrit.libreoffice.org/43146
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit ee46269003aed237edcd9c086fd14ecded08bbeb)
    
    Change-Id: I30001e63cd17ae68ba4988d5825de479a4496326
    Reviewed-on: https://gerrit.libreoffice.org/43215
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 2db6ff88a8b8..c5e67657384c 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -134,7 +134,7 @@ void initFromCell(
 
     if (rCell.hasError())
     {
-        rData.SetErrorString(rCache.InternString(aDocStr));
+        rData.SetErrorString(rCache.InternString(pDoc->GetString(rPos.Col(), rPos.Row(), rPos.Tab())));
     }
     else if (rCell.hasNumeric())
     {