summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2017-04-21 21:42:32 -0400
committerKohei Yoshida <libreoffice@kohei.us>2017-04-25 01:47:53 +0200
commit7c80ea40fab3cb8e8893d14e80e7bb7f63f0dbb0 (patch)
tree57b32bed211c4bbc532fbc1df10a5ebd118f4cfd
parenta917902c48f21d04039da86048c5c36555137d7e (diff)
tdf#107310: hybrid cell is a value cell as well as a string cell.
Else it would cause a legitimate calculation to fail with #VALUE!. Change-Id: If8d4f40859d0c87b97afc952e4a3e4268450c40c Reviewed-on: https://gerrit.libreoffice.org/36817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
-rw-r--r--sc/source/core/tool/formularesult.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
index 95b8ded0cca5..90becca556dc 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -294,6 +294,9 @@ inline bool isString( formula::StackVar sv )
bool ScFormulaResult::IsValue() const
{
+ if (IsEmptyDisplayedAsString())
+ return true;
+
return isValue(GetCellResultType());
}