[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/formularesult.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 26f1ab7e4d8407834cb1d5c1339ac29552ba220d
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Apr 21 21:42:32 2017 -0400

    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!.
    
    Reviewed-on: https://gerrit.libreoffice.org/36817
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    (cherry picked from commit 7c80ea40fab3cb8e8893d14e80e7bb7f63f0dbb0)
    Reviewed-on: https://gerrit.libreoffice.org/36917
    Reviewed-by: Eike Rathke <erack at redhat.com>
    
    Change-Id: If8d4f40859d0c87b97afc952e4a3e4268450c40c

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());
 }