From ee86d223b8e6b5d164e96e6169a9d1f145081a1e Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Fri, 21 Apr 2017 21:42:32 -0400
Subject: 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>
(cherry picked from commit 7c80ea40fab3cb8e8893d14e80e7bb7f63f0dbb0)
Reviewed-on: https://gerrit.libreoffice.org/36917
Reviewed-by: Eike Rathke <erack@redhat.com>
---
 sc/source/core/tool/formularesult.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sc')

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());
 }
 
-- 
cgit v1.2.3