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

[Tamás Zolnai]

 sc/source/core/data/dpoutput.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ad936ab46da3a0b22aff4f5c5c00d78e323adafe
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Fri Sep 29 00:25:23 2017 +0200

    tdf#112735: Pivot table: page field displays empty string
    
    ... instead of the "(empty)" string
    
    Change-Id: I2df84393b5213a57e941c9447e4367d7605a6b00
    Reviewed-on: https://gerrit.libreoffice.org/42957
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 8a4df9376bf299beb49fe116882ffdbd10b5e02b)
    Reviewed-on: https://gerrit.libreoffice.org/43052
    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/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 6f1faf87b5f2..4f46567f564a 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1040,7 +1040,12 @@ void ScDPOutput::Output()
         const uno::Sequence<sheet::MemberResult>& rRes = pPageFields[nField].aResult;
         sal_Int32 n = rRes.getLength();
         if (n == 1)
-            aPageValue = rRes[0].Caption;
+        {
+            if (rRes[0].Caption.isEmpty())
+                aPageValue = ScGlobal::GetRscString(STR_EMPTYDATA);
+            else
+                aPageValue = rRes[0].Caption;
+        }
         else if (n > 1)
             aPageValue = ScResId(SCSTR_MULTIPLE).toString();