sc/inc/globstr.hrc             |    1 +
 sc/source/core/data/global.cxx |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit df8ae4fddb77f5621f651f05e72f8c2bd4ae111b
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Wed Apr 19 21:45:22 2023 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Thu Apr 20 14:32:46 2023 +0200

    Related: tdf#154915 #NULL! is not an "Internal syntactical error"
    
    ... but "Error: No code or intersection".
    
    Change-Id: I8c161e6553084fc849092f689273cbe181033e22
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150654
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 16fce3f32974..0aa8d010f9df 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -239,6 +239,7 @@
 #define STR_NO_MACRO                            NC_("STR_NO_MACRO", "#MACRO?")
 #define STR_LONG_ERR_NO_MACRO                   NC_("STR_LONG_ERR_NO_MACRO", 
"Error: Macro not found")
 #define STR_LONG_ERR_SYNTAX                     NC_("STR_LONG_ERR_SYNTAX", 
"Internal syntactical error")
+#define STR_LONG_ERR_NO_CODE                    NC_("STR_LONG_ERR_NO_CODE", 
"Error: No code or intersection")
 #define STR_LONG_ERR_ILL_ARG                    NC_("STR_LONG_ERR_ILL_ARG", 
"Error: Invalid argument")
 #define STR_LONG_ERR_ILL_PAR                    NC_("STR_LONG_ERR_ILL_PAR", 
"Error in parameter list")
 #define STR_LONG_ERR_ILL_CHAR                   NC_("STR_LONG_ERR_ILL_CHAR", 
"Error: Invalid character")
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 61c873737dc1..02167599e926 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -391,9 +391,11 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
         case FormulaError::UnknownOpCode:
         case FormulaError::UnknownStackVariable:
         case FormulaError::UnknownToken:
-        case FormulaError::NoCode:
             pErrNumber = STR_LONG_ERR_SYNTAX;
         break;
+        case FormulaError::NoCode:
+            pErrNumber = STR_LONG_ERR_NO_CODE;
+        break;
         case FormulaError::CircularReference:
             pErrNumber = STR_LONG_ERR_CIRC_REF;
         break;

Reply via email to