sc/source/core/tool/interpr4.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 11535b80816d131963eb8f916ba1791816513664
Author: Eike Rathke <er...@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.mohrh...@googlemail.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0)
Reviewed-on: https://gerrit.libreoffice.org/27373
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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
