summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-07-11 14:20:37 +0200
committerAndras Timar <andras.timar@collabora.com>2016-07-22 15:00:11 +0200
commit9da9cabfc68a73d4ac9db7ec86f44c8713edb9e0 (patch)
tree4d017337db1479de69c7fee4a9dd9ab9b461a0b6
parentd11ba6d14c364cb79089cb2947476227f1316e00 (diff)
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@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0) Reviewed-on: https://gerrit.libreoffice.org/27372 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 38aceeda9df7a04bff344c82c4bc077217b1178d)
-rw-r--r--sc/source/core/tool/interpr4.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c0141306de7f..0642fcd29595 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());