formula/source/core/resource/core_resource.src | 8 ++++---- include/formula/compiler.hrc | 2 +- include/formula/opcode.hxx | 2 +- sc/source/ui/src/scfuncs.src | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit ed6c797d07f6e7f1afdb272046f9a02b973f97de Author: Laurent Charrière <lcharri...@gmail.com> Date: Tue Jan 13 10:52:23 2015 +0100 fdo#85818: rename SC_OPCODE_IKV to SC_OPCODE_IRR Change-Id: I8148081e2f2d89bdd319b5dc7346af672a8cf310 Reviewed-on: https://gerrit.libreoffice.org/13896 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 93d08f2..062b432 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -183,7 +183,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_COUNT { Text = "COUNT" ; }; String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; }; String SC_OPCODE_NBW { Text = "NPV" ; }; - String SC_OPCODE_IKV { Text = "IRR" ; }; + String SC_OPCODE_IRR { Text = "IRR" ; }; String SC_OPCODE_MIRR { Text = "MIRR" ; }; String SC_OPCODE_ISPMT { Text = "ISPMT" ; }; String SC_OPCODE_VAR { Text = "VAR" ; }; @@ -591,7 +591,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_COUNT { Text = "COUNT" ; }; String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; }; String SC_OPCODE_NBW { Text = "NPV" ; }; - String SC_OPCODE_IKV { Text = "IRR" ; }; + String SC_OPCODE_IRR { Text = "IRR" ; }; String SC_OPCODE_MIRR { Text = "MIRR" ; }; String SC_OPCODE_ISPMT { Text = "ISPMT" ; }; String SC_OPCODE_VAR { Text = "VAR" ; }; @@ -1001,7 +1001,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_COUNT { Text = "COUNT" ; }; String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; }; String SC_OPCODE_NBW { Text = "NPV" ; }; - String SC_OPCODE_IKV { Text = "IRR" ; }; + String SC_OPCODE_IRR { Text = "IRR" ; }; String SC_OPCODE_MIRR { Text = "MIRR" ; }; String SC_OPCODE_ISPMT { Text = "ISPMT" ; }; String SC_OPCODE_VAR { Text = "VAR" ; }; @@ -1818,7 +1818,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "NPV" ; }; - String SC_OPCODE_IKV + String SC_OPCODE_IRR { Text [ en-US ] = "IRR" ; }; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index fc47ae8..7cd6653 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -228,7 +228,7 @@ #define SC_OPCODE_COUNT 227 #define SC_OPCODE_COUNT_2 228 #define SC_OPCODE_NBW 229 -#define SC_OPCODE_IKV 230 +#define SC_OPCODE_IRR 230 #define SC_OPCODE_VAR 231 #define SC_OPCODE_VAR_P 232 #define SC_OPCODE_ST_DEV 233 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 724667f..43f2467 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -221,7 +221,7 @@ enum OpCode : sal_uInt16 ocCount = SC_OPCODE_COUNT, ocCount2 = SC_OPCODE_COUNT_2, ocNPV = SC_OPCODE_NBW, - ocIRR = SC_OPCODE_IKV, + ocIRR = SC_OPCODE_IRR, ocMIRR = SC_OPCODE_MIRR, ocISPMT = SC_OPCODE_ISPMT, ocVar = SC_OPCODE_VAR, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 0c0b310..b0c2182 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -2077,7 +2077,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 }; }; // -=*# Resource for function IRR #*=- - Resource SC_OPCODE_IKV + Resource SC_OPCODE_IRR { String 1 // Description {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits