diff options
| author | Eike Rathke <erack@redhat.com> | 2016-08-03 18:56:01 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-08-03 18:57:37 +0200 |
| commit | ced79363cc30f225e766195ace4f892754fc85a0 (patch) | |
| tree | 94b2554faecda3744b05dcf61b99ebc2b25be5ab /formula | |
| parent | fa2fdb6607a7b961affadb6ca633b8feed828467 (diff) | |
Resolves: tdf#69539 UI rename CONVERT to CONVERT_OOO, CONVERT_ADD to CONVERT
... with same syntax but different semantics that was even more confusing.
Change-Id: Ibe1efcd5c4e82c9ce8d9fe8ed0f85e86dac327f7
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index b1f09ddcaf84..40f489536ef8 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -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_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; // wrong but ODF1.1, keep it. 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_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; /* TODO: wrong but API, change? */ 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_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT_OOO" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -3750,7 +3750,7 @@ Resource RID_STRLIST_FUNCTION_NAMES }; String SC_OPCODE_CONVERT_OOO { - Text [ en-US ] = "CONVERT"; + Text [ en-US ] = "CONVERT_OOO"; }; String SC_OPCODE_ROMAN { |