diff options
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 86ac30a09442..7354cfc59484 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1338,7 +1338,7 @@ void FormulaCompiler::Factor() // Don't use SetExclusiveRecalcModeOnLoad() which would // override ModeAlways, use // AddRecalcMode(ScRecalcMode::ONLOAD) instead. - case ocConvert : + case ocConvertOOo : case ocDde: case ocMacro: case ocExternal: diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index d130204c1156..b1f09ddcaf84 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -421,7 +421,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT { Text = "ORG.OPENOFFICE.CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "ORG.OPENOFFICE.CONVERT" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -859,7 +859,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "_xlfn.BASE" ; }; String SC_OPCODE_DECIMAL { Text = "_xlfn.DECIMAL" ; }; - String SC_OPCODE_CONVERT { Text = "_xlfn.ORG.OPENOFFICE.CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "_xlfn.ORG.OPENOFFICE.CONVERT" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "_xlfn.ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -1301,7 +1301,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -1743,7 +1743,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_API String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -2184,7 +2184,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -3748,7 +3748,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "DECIMAL" ; }; - String SC_OPCODE_CONVERT + String SC_OPCODE_CONVERT_OOO { Text [ en-US ] = "CONVERT"; }; |