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

[Eike Rathke]

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

New commits:
commit 38aceeda9df7a04bff344c82c4bc077217b1178d
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jul 11 14:20:37 2016 +0200

    Resolves: tdf#100847 also external svEmptyCell is 0 in numeric context
    
    Regression of 243f19a1878d52a4074b59041dc3bc57ab84e417 that now
    differentiates between numeric and string content of external
    references' cells.
    
    Change-Id: I7a9635357cc7651353067a38f9ac8bc295f88546
    (cherry picked from commit 89a5464a21046821648ec77f03db8316ceb4e6f8)
    Reviewed-on: https://gerrit.libreoffice.org/27111
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0)
    Reviewed-on: https://gerrit.libreoffice.org/27372
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 9cf3ed1..2e31123 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1991,7 +1991,7 @@ double ScInterpreter::GetDouble()
             PopExternalSingleRef(pToken);
             if (!nGlobalError && pToken)
             {
-                if (pToken->GetType() == svDouble)
+                if (pToken->GetType() == svDouble || pToken->GetType() == svEmptyCell)
                     nVal = pToken->GetDouble();
                 else
                     nVal = ConvertStringToValue( pToken->GetString().getString());