[Libreoffice-commits] core.git: formula/source

[Caolán McNamara]

 formula/source/core/api/FormulaCompiler.cxx    |    1 
 formula/source/core/inc/core_resource.hrc      |    3 -
 formula/source/core/resource/core_resource.src |   59 +++++++++++++------------
 3 files changed, 36 insertions(+), 27 deletions(-)

New commits:
commit f772812e6bd358ec200fc1d7057842f19626c31d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 2 15:55:39 2017 +0100

    split out the non-translatable strings
    
    Change-Id: Id4c3e9265ae591b938ae43554208823e0cdc06c0
    Reviewed-on: https://gerrit.libreoffice.org/37164
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 154e51e6f7e1..767f4da86a7a 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -839,6 +839,7 @@ void lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, bool bD
             new FormulaCompiler::OpCodeMap(
                 SC_OPCODE_LAST_OPCODE_ID + 1, true, FormulaGrammar::GRAM_NATIVE_UI));
         OModuleClient aModuleClient;
+        OpCodeList aOpCodeListSymbols(RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap);
         OpCodeList aOpCodeListNative(RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap);
         // No AddInMap for native core mapping.
     }
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index 8aed9b7382a3..750be5afbef3 100644
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.hrc
@@ -31,7 +31,8 @@
 #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF     (RID_CORE_OTHER_START + 2)
 #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_API      (RID_CORE_OTHER_START + 3)
 #define RID_STRLIST_FUNCTION_NAMES_ENGLISH          (RID_CORE_OTHER_START + 4)
-#define RID_STRLIST_FUNCTION_NAMES                  (RID_CORE_OTHER_START + 5)
+#define RID_STRLIST_FUNCTION_NAMES_SYMBOLS          (RID_CORE_OTHER_START + 5)
+#define RID_STRLIST_FUNCTION_NAMES                  (RID_CORE_OTHER_START + 6)
 
 #endif
 
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index bd3f487e1330..4861720ec0f5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -2251,42 +2251,16 @@ StringArray RID_STRLIST_FUNCTION_NAMES
         < "IFERROR" ; SC_OPCODE_IF_ERROR ; >;
         < "IFNA" ; SC_OPCODE_IF_NA ; >;
         < "CHOOSE" ; SC_OPCODE_CHOOSE ; >;
-        < "(" ; SC_OPCODE_OPEN ; >;
-        < ")" ; SC_OPCODE_CLOSE ; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN ; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE ; >;
         < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL ; >;
         < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS ; >;
         < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA ; >;
         < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS ; >;
         < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW ; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN ; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE ; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP ; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP ; >;
-        < ";" ; SC_OPCODE_SEP ; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN ; >;
-        < "+" ; SC_OPCODE_ADD ; >;
-        < "-" ; SC_OPCODE_SUB ; >;
-        < "*" ; SC_OPCODE_MUL ; >;
-        < "/" ; SC_OPCODE_DIV ; >;
-        < "&" ; SC_OPCODE_AMPERSAND ; >;
-        < "^" ; SC_OPCODE_POW ; >;
-        < "=" ; SC_OPCODE_EQUAL ; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL ; >;
-        < "<" ; SC_OPCODE_LESS ; >;
-        < ">" ; SC_OPCODE_GREATER ; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL ; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL ; >;
         < "AND" ; SC_OPCODE_AND ; >;
         < "OR" ; SC_OPCODE_OR ; >;
         < "XOR" ; SC_OPCODE_XOR ; >;
-        < "!" ; SC_OPCODE_INTERSECT ; >;
-        < "~" ; SC_OPCODE_UNION ; >;
-        < ":" ; SC_OPCODE_RANGE ; >;
         < "NOT" ; SC_OPCODE_NOT ; >;
         < "NEG" ; SC_OPCODE_NEG ; >;
-        < "-" ; SC_OPCODE_NEG_SUB ; >;
         < "PI" ; SC_OPCODE_PI ; >; // ???
         < "RAND" ; SC_OPCODE_RANDOM ; >;
         < "TRUE" ; SC_OPCODE_TRUE ; >;
@@ -2692,4 +2666,37 @@ StringArray RID_STRLIST_FUNCTION_NAMES
     };
 };
 
+StringArray RID_STRLIST_FUNCTION_NAMES_SYMBOLS
+{
+    ItemList =
+    {
+        < "(" ; SC_OPCODE_OPEN ; >;
+        < ")" ; SC_OPCODE_CLOSE ; >;
+        < "[" ; SC_OPCODE_TABLE_REF_OPEN ; >;
+        < "]" ; SC_OPCODE_TABLE_REF_CLOSE ; >;
+        < "{" ; SC_OPCODE_ARRAY_OPEN ; >;
+        < "}" ; SC_OPCODE_ARRAY_CLOSE ; >;
+        < "|" ; SC_OPCODE_ARRAY_ROW_SEP ; >;
+        < ";" ; SC_OPCODE_ARRAY_COL_SEP ; >;
+        < ";" ; SC_OPCODE_SEP ; >;
+        < "%" ; SC_OPCODE_PERCENT_SIGN ; >;
+        < "+" ; SC_OPCODE_ADD ; >;
+        < "-" ; SC_OPCODE_SUB ; >;
+        < "*" ; SC_OPCODE_MUL ; >;
+        < "/" ; SC_OPCODE_DIV ; >;
+        < "&" ; SC_OPCODE_AMPERSAND ; >;
+        < "^" ; SC_OPCODE_POW ; >;
+        < "=" ; SC_OPCODE_EQUAL ; >;
+        < "<>" ; SC_OPCODE_NOT_EQUAL ; >;
+        < "<" ; SC_OPCODE_LESS ; >;
+        < ">" ; SC_OPCODE_GREATER ; >;
+        < "<=" ; SC_OPCODE_LESS_EQUAL ; >;
+        < ">=" ; SC_OPCODE_GREATER_EQUAL ; >;
+        < "!" ; SC_OPCODE_INTERSECT ; >;
+        < "~" ; SC_OPCODE_UNION ; >;
+        < ":" ; SC_OPCODE_RANGE ; >;
+        < "-" ; SC_OPCODE_NEG_SUB ; >;
+    };
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */