[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/unoobj/chart2uno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 811d39b4ed3487ac6eb81d04de70f9845fec32db
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Thu Nov 29 00:04:58 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 29 14:03:10 2018 +0100

    tdf#105236, only take number format from numeric cells
    
    Change-Id: I55deaa1f0579582a45dc1e10bb578b680eb98647
    Reviewed-on: https://gerrit.libreoffice.org/64200
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit fb04e7180cdf656dbbd3daa9c81615d9478229e0)
    Reviewed-on: https://gerrit.libreoffice.org/64204
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 34ab089b86f0..89ebe89061ee 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3161,7 +3161,7 @@ sal_uInt32 getDisplayNumberFormat(const ScDocument* pDoc, const ScAddress& rPos)
         for (const Item& rItem : m_aDataArray)
         {
             ScRefCellValue aCell(*m_pDocument, rItem.mAddress);
-            if (!aCell.isEmpty())
+            if (!aCell.isEmpty() && aCell.hasNumeric())
             {
                 return static_cast<sal_Int32>(getDisplayNumberFormat(m_pDocument, rItem.mAddress));
             }