[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 0b84398784dfffca807965d678aeee5c2c302b66
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Aug 30 17:18:18 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Aug 31 13:57:00 2018 +0200

    tdf#73078 Let 'Type()' return '1' for empty cells
    
    Quote from tdf#73078:
    
    > The function TYPE is specified with the Syntax:
    > TYPE( Any value ) and the rule "If a Reference
    > is provided, the reference is first dereferenced,
    > and any formulas are evaluated."
    > [ODF1.2 part2 section 6.13.33 TYP]
    >
    > Because of argument type "Any" the function cannot result
    > in an error. Gnumeric, Apache OpenOffice, and Excel return
    > the number 1 in this case.
    
    Therefore, have LibreOffice return 1 as well, rather than
    having an "Err:502" ("Error: Invalid argument").
    
    Change-Id: I1e679645e7b2e70e185574f805cd410b0508cbd8
    Reviewed-on: https://gerrit.libreoffice.org/59826
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 0383ccd4e7116c3d26edc1f86b7a74fe3cf649bd)
    Reviewed-on: https://gerrit.libreoffice.org/59852
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c78c0593e986..a2d0dfa0f865 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2120,6 +2120,10 @@ void ScInterpreter::ScType()
                             nType = 1;
                     }
                     break;
+                    case CELLTYPE_NONE:
+                        // always 1, s. tdf#73078
+                        nType = 1;
+                        break;
                     case CELLTYPE_FORMULA :
                         nType = 8;
                         break;