formula/source/core/api/FormulaCompiler.cxx | 2 +-
formula/source/core/resource/core_resource.src | 8 ++++----
include/formula/compiler.hrc | 2 +-
include/formula/opcode.hxx | 2 +-
sc/source/core/inc/interpre.hxx | 2 +-
sc/source/core/tool/compiler.cxx | 2 +-
sc/source/core/tool/interpr2.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d480e5c7f68d61cf51c233f62c07293f212b9f4a
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jun 27 15:59:40 2016 +0200
rename *effective to *effect, tdf#100641 related
... to unify naming.
Change-Id: I0964822d53eafd69ea4ed0656dfdfcb3f5bfd561
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 675da4b..1379cba 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 ocRRI:
- case ocEffective:
+ case ocEffect:
case ocNominal:
case ocPercentSign:
return css::util::NumberFormat::PERCENT;
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index c781fa0..2124218a 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -238,7 +238,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_EFFECTIVE { Text = "EFFECT" ; };
+ String SC_OPCODE_EFFECT { Text = "EFFECT" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -678,7 +678,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_EFFECTIVE { Text = "EFFECT" ; };
+ String SC_OPCODE_EFFECT { Text = "EFFECT" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -1118,7 +1118,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_EFFECTIVE { Text = "EFFECTIVE" ; };
+ String SC_OPCODE_EFFECT { Text = "EFFECTIVE" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
String SC_OPCODE_DB_SUM { Text = "DSUM" ; };
@@ -2142,7 +2142,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "CUMPRINC" ;
};
- String SC_OPCODE_EFFECTIVE
+ String SC_OPCODE_EFFECT
{
Text [ en-US ] = "EFFECT" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 7a7bfe7..ccba5df 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -272,7 +272,7 @@
#define SC_OPCODE_PPMT 261
#define SC_OPCODE_CUM_IPMT 262
#define SC_OPCODE_CUM_PRINC 263
-#define SC_OPCODE_EFFECTIVE 264
+#define SC_OPCODE_EFFECT 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 30dc94f..c06a992 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -278,7 +278,7 @@ enum OpCode : sal_uInt16
ocPpmt = SC_OPCODE_PPMT,
ocCumIpmt = SC_OPCODE_CUM_IPMT,
ocCumPrinc = SC_OPCODE_CUM_PRINC,
- ocEffective = SC_OPCODE_EFFECTIVE,
+ ocEffect = SC_OPCODE_EFFECT,
ocNominal = SC_OPCODE_NOMINAL,
ocSubTotal = SC_OPCODE_SUB_TOTAL,
ocRawSubtract = SC_OPCODE_RAWSUBTRACT,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3ed275a..c0af821 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -760,7 +760,7 @@ void ScIpmt();
void ScPpmt();
void ScCumIpmt();
void ScCumPrinc();
-void ScEffective();
+void ScEffect();
void ScNominal();
void ScMod();
void ScIntercept();
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index adff3f4..e5a91be 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2750,7 +2750,7 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool
bInArray )
OpCode eOp;
};
static const FunctionName aOoxmlAliases[] = {
- { "EFFECTIVE", ocEffective } // EFFECTIVE -> EFFECT
+ { "EFFECTIVE", ocEffect } // EFFECTIVE -> EFFECT
};
for (const FunctionName& rOoxmlAlias : aOoxmlAliases)
{
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ac20f10..ebee443 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2121,7 +2121,7 @@ void ScInterpreter::ScCumPrinc()
}
}
-void ScInterpreter::ScEffective()
+void ScInterpreter::ScEffect()
{
nFuncFmtType = css::util::NumberFormat::PERCENT;
if ( MustHaveParamCount( GetByte(), 2 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f7c75a6..992b6cb 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3999,7 +3999,7 @@ StackVar ScInterpreter::Interpret()
case ocPpmt : ScPpmt(); break;
case ocCumIpmt : ScCumIpmt(); break;
case ocCumPrinc : ScCumPrinc(); break;
- case ocEffective : ScEffective(); break;
+ case ocEffect : ScEffect(); 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 76ff512..0e9257f 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -332,7 +332,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" ) },
- { ocEffective, 255, 1, MX, R, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN(
"Analysis.getEffect" ) },
+ { ocEffect, 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 faa26fe..d5a2394 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2081,8 +2081,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 EFFECTIVE #*=-
- Resource SC_OPCODE_EFFECTIVE
+ // -=*# Resource for function EFFECT #*=-
+ Resource SC_OPCODE_EFFECT
{
String 1 // Description
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
