diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 13:43:55 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:55:37 +0000 |
| commit | 92cef7eb344c9c9c7a6aa1489845a1b0eb346ead (patch) | |
| tree | bacb8be282c68510c5df1361fa97b94da982b369 /formula | |
| parent | c6d3405d9cf75adc8ae9f8b2cca2dfd2c9de7d7d (diff) | |
fdo#85818: rename ZGZ to RRI
Change-Id: Ifeb513eba762f881dd4ea7cd7fc531fe5028106d
Reviewed-on: https://gerrit.libreoffice.org/13831
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 4 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 5d289fb03c53..d1ef9a958188 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -108,7 +108,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocRate: case ocIRR: case ocMIRR: - case ocZGZ: + case ocRRI: case ocEffective: case ocNominal: case ocPercentSign: @@ -917,7 +917,7 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r, bool bOverrideKno OpCode eOp = OpCode(i); switch (eOp) { - case ocZGZ: + case ocRRI: aSymbol = "RRI"; break; case ocTableOp: diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 81cafdf15885..1e76de27c223 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -224,7 +224,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_COLUMN { Text = "COLUMN" ; }; String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "SHEET" ; }; - String SC_OPCODE_ZGZ { Text = "RRI" ; }; + String SC_OPCODE_RRI { Text = "RRI" ; }; String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; @@ -631,7 +631,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_COLUMN { Text = "COLUMN" ; }; String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "_xlfn.SHEET" ; }; - String SC_OPCODE_ZGZ { Text = "_xlfn.RRI" ; }; + String SC_OPCODE_RRI { Text = "_xlfn.RRI" ; }; String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; @@ -1040,7 +1040,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_COLUMN { Text = "COLUMN" ; }; String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "SHEET" ; }; - String SC_OPCODE_ZGZ { Text = "ZGZ" ; }; + String SC_OPCODE_RRI { Text = "ZGZ" ; }; String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; @@ -1979,7 +1979,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "SHEET" ; }; - String SC_OPCODE_ZGZ + String SC_OPCODE_RRI { Text [ en-US ] = "RRI" ; }; |