strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename *effective to *effect, tdf#100641 related

Browse source 
... to unify naming.

Change-Id: I0964822d53eafd69ea4ed0656dfdfcb3f5bfd561
This commit is contained in:
Eike Rathke 2016-06-27 15:59:40 +02:00
parent fd07d67bea
commit d480e5c7f6
10 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
formula/source/core/api/FormulaCompiler.cxx
View file

@ -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;

8
formula/source/core/resource/core_resource.src
View file

@ -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" ;
};

2
include/formula/compiler.hrc
View file

@ -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 */

2
include/formula/opcode.hxx
View file

@ -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,

2
sc/source/core/inc/interpre.hxx
View file

@ -760,7 +760,7 @@ void ScIpmt();
void ScPpmt();
void ScCumIpmt();
void ScCumPrinc();
void ScEffective();
void ScEffect();
void ScNominal();
void ScMod();
void ScIntercept();

2
sc/source/core/tool/compiler.cxx
View file

@ -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)
{

2
sc/source/core/tool/interpr2.cxx
View file

@ -2121,7 +2121,7 @@ void ScInterpreter::ScCumPrinc()
}
}
void ScInterpreter::ScEffective()
void ScInterpreter::ScEffect()
{
nFuncFmtType = css::util::NumberFormat::PERCENT;
if ( MustHaveParamCount( GetByte(), 2 ) )

2
sc/source/core/tool/interpr4.cxx
View file

@ -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;

2
sc/source/filter/excel/xlformula.cxx
View file

@ -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" ) },

4
sc/source/ui/src/scfuncs.src
View file

@ -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
{