fdo#85818: rename Effektiv to Effective

Change-Id: I55a863f7d7068de9abc468676ecf2e54ecd3c06c
Reviewed-on: https://gerrit.libreoffice.org/13823
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

9 files changed, 13 insertions, 13 deletions

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index c91a50a6b78b..de527e48801d 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -109,7 +109,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
         case ocIRR:
         case ocMIRR:
         case ocZGZ:
-        case ocEffektiv:
+        case ocEffective:
         case ocNominal:
         case ocPercentSign:
             return NUMBERFORMAT_PERCENT;
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index e2a3ed52340a..a5bf5d8a755f 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -232,7 +232,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_PPMT { Text = "PPMT" ; };
     String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
     String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
-    String SC_OPCODE_EFFEKTIV { Text = "EFFECT" ; };
+    String SC_OPCODE_EFFECTIVE { Text = "EFFECT" ; };
     String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
     String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
     String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -639,7 +639,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
     String SC_OPCODE_PPMT { Text = "PPMT" ; };
     String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
     String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
-    String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
+    String SC_OPCODE_EFFECTIVE { Text = "EFFECTIVE" ; };
     String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
     String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
     String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -1048,7 +1048,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
     String SC_OPCODE_PPMT { Text = "PPMT" ; };
     String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
     String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
-    String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
+    String SC_OPCODE_EFFECTIVE { Text = "EFFECTIVE" ; };
     String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
     String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
     String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -2011,7 +2011,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
     {
         Text [ en-US ] = "CUMPRINC" ;
     };
-    String SC_OPCODE_EFFEKTIV
+    String SC_OPCODE_EFFECTIVE
     {
         Text [ en-US ] = "EFFECTIVE" ;
     };
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index d420fbd87d4a..be61ed88b076 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -261,7 +261,7 @@
 #define SC_OPCODE_PPMT              261
 #define SC_OPCODE_CUM_IPMT          262
 #define SC_OPCODE_CUM_PRINC         263
-#define SC_OPCODE_EFFEKTIV          264
+#define SC_OPCODE_EFFECTIVE         264
 #define SC_OPCODE_NOMINAL           265
 #define SC_OPCODE_SUB_TOTAL         266
 #define SC_OPCODE_DB_SUM            267     /* database functions */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index e6260ce89c88..f6de536f53fd 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -265,7 +265,7 @@ enum OpCode : sal_uInt16
         ocPpmt              = SC_OPCODE_PPMT,
         ocCumIpmt           = SC_OPCODE_CUM_IPMT,
         ocCumPrinc          = SC_OPCODE_CUM_PRINC,
-        ocEffektiv          = SC_OPCODE_EFFEKTIV,
+        ocEffective         = SC_OPCODE_EFFECTIVE,
         ocNominal           = SC_OPCODE_NOMINAL,
         ocSubTotal          = SC_OPCODE_SUB_TOTAL,
     // Database functions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 60ef2a9d9201..bc57d19b67ee 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -688,7 +688,7 @@ void ScIpmt();
 void ScPpmt();
 void ScCumIpmt();
 void ScCumPrinc();
-void ScEffektiv();
+void ScEffective();
 void ScNominal();
 void ScMod();
 void ScIntercept();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 83748edfb3a7..b90e0566df7b 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1862,7 +1862,7 @@ void ScInterpreter::ScCumPrinc()
     }
 }
 
-void ScInterpreter::ScEffektiv()
+void ScInterpreter::ScEffective()
 {
     nFuncFmtType = NUMBERFORMAT_PERCENT;
     if ( MustHaveParamCount( GetByte(), 2 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c882fc18b8d1..1b7f50cc75a9 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4048,7 +4048,7 @@ StackVar ScInterpreter::Interpret()
                 case ocPpmt             : ScPpmt();                     break;
                 case ocCumIpmt          : ScCumIpmt();                  break;
                 case ocCumPrinc         : ScCumPrinc();                 break;
-                case ocEffektiv         : ScEffektiv();                 break;
+                case ocEffective        : ScEffective();                break;
                 case ocNominal          : ScNominal();                  break;
                 case ocSubTotal         : ScSubTotal();                 break;
                 case ocAggregate        : ScAggregate();                break;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 90e8de3edd43..699d9fb4dbc4 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -333,7 +333,7 @@ static const XclFunctionInfo saFuncTable_4[] =
     { ocIsOdd,              255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getIsodd" ) },
     { ocGCD,                255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getGcd" ) },
     { ocLCM,                255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getLcm" ) },
-    { ocEffektiv,           255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getEffect" ) },
+    { ocEffective,          255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getEffect" ) },
     { ocCumPrinc,           255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumprinc" ) },
     { ocCumIpmt,            255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumipmt" ) },
     { ocNominal,            255,    1,  MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getNominal" ) }
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index a51cdd9c5b20..efa107ef9f52 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1980,8 +1980,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
             Text [ en-US ] = "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch." ;
         };
     };
-     // -=*# Resource for function EFFEKTIV #*=-
-    Resource SC_OPCODE_EFFEKTIV
+     // -=*# Resource for function EFFECTIVE #*=-
+    Resource SC_OPCODE_EFFECTIVE
     {
         String 1 // Description
         {