summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorLaurent Charrière <lcharriere@gmail.com>2015-01-09 13:43:55 +0100
committerNoel Grandin <noelgrandin@gmail.com>2015-01-12 06:55:37 +0000
commit92cef7eb344c9c9c7a6aa1489845a1b0eb346ead (patch)
treebacb8be282c68510c5df1361fa97b94da982b369 /sc
parentc6d3405d9cf75adc8ae9f8b2cca2dfd2c9de7d7d (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 'sc')
-rw-r--r--sc/source/core/inc/interpre.hxx2
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx2
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/core/tool/interpr2.cxx2
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/core/tool/parclass.cxx2
-rw-r--r--sc/source/core/tool/token.cxx2
-rw-r--r--sc/source/filter/excel/xlformula.cxx2
-rw-r--r--sc/source/filter/qpro/qproform.cxx4
-rw-r--r--sc/source/ui/src/scfuncs.src4
10 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6f6b75cc6548..9904cbcb9d22 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -674,7 +674,7 @@ void ScSLN();
double ScGetRmz(double fZins, double fZzr, double fBw,
double fZw, double fF);
void ScPMT();
-void ScZGZ();
+void ScRRI();
double ScGetZw(double fZins, double fZzr, double fRmz,
double fBw, double fF);
void ScZW();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index d9295bfc3d3b..a327d1f74d02 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2268,7 +2268,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
case ocRate:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpIntrate, nResultSize));
break;
- case ocZGZ:
+ case ocRRI:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpRRI, nResultSize));
break;
case ocPpmt:
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 9ae147412470..4ac0951f5820 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2448,7 +2448,7 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
{ "B", ocB }, // B -> BINOM.DIST.RANGE
{ "TDIST", ocTDist }, // TDIST -> LEGACY.TDIST
{ "EASTERSUNDAY", ocEasterSunday }, // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY
- { "ZGZ", ocZGZ }, // ZGZ -> RRI
+ { "ZGZ", ocRRI }, // ZGZ -> RRI
{ "COLOR", ocColor }, // COLOR -> ORG.LIBREOFFICE.COLOR
{ "GOALSEEK", ocBackSolver } // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK
// Renamed new names, prepare to read future names:
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 5a62b449e326..038e679e78f4 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1481,7 +1481,7 @@ void ScInterpreter::ScPMT()
PushDouble(ScGetRmz(nInterest, nZzr, nBw, nZw, nFlag));
}
-void ScInterpreter::ScZGZ()
+void ScInterpreter::ScRRI()
{
nFuncFmtType = NUMBERFORMAT_PERCENT;
if ( MustHaveParamCount( GetByte(), 3 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index ea532ae5aaf6..ff4639e1f22a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4035,7 +4035,7 @@ StackVar ScInterpreter::Interpret()
case ocColumn : ScColumn(); break;
case ocRow : ScRow(); break;
case ocTable : ScTable(); break;
- case ocZGZ : ScZGZ(); break;
+ case ocRRI : ScRRI(); break;
case ocZW : ScZW(); break;
case ocZZR : ScZZR(); break;
case ocRate : ScRate(); break;
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 2ebdfdf3ffe8..b066c5c1744f 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -586,7 +586,7 @@ void ScParameterClassification::GenerateDocumentation()
aStr.append(')');
switch ( eOp )
{
- case ocZGZ:
+ case ocRRI:
aStr.append(" // RRI in English resource, but ZGZ in English-only section");
break;
case ocMultiArea:
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8d01d042f060..072af240cfc2 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1172,7 +1172,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocMIRR:
case ocPMT:
case ocRate:
- case ocZGZ:
+ case ocRRI:
case ocPpmt:
case ocFisher:
case ocFisherInv:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 01f54c8ade0d..31b70a47aa95 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -557,7 +557,7 @@ static const XclFunctionInfo saFuncTable_2013[] =
EXC_FUNCENTRY_V_VR( ocDuration, 3, 3, 0, "PDURATION" ),
EXC_FUNCENTRY_V_VR( ocPermutationA, 2, 2, 0, "PERMUTATIONA" ),
EXC_FUNCENTRY_V_VR( ocPhi, 1, 1, 0, "PHI" ),
- EXC_FUNCENTRY_V_VR( ocZGZ, 3, 3, 0, "RRI" ),
+ EXC_FUNCENTRY_V_VR( ocRRI, 3, 3, 0, "RRI" ),
EXC_FUNCENTRY_V_VR_IMPORT( ocSecant, 1, 1, 0, "SEC" ),
EXC_FUNCENTRY_V_VR_IMPORT( ocSecantHyp, 1, 1, 0, "SECH" ),
EXC_FUNCENTRY_V_RO( ocTable, 0, 1, 0, "SHEET" ),
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 2372b6aa8339..3121eb262e5e 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -135,7 +135,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
{
sal_Int16 nLast = nArgs- 1;
- if( eOc == ocZGZ )
+ if( eOc == ocRRI )
aPool << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ];
if( eOc == ocIpmt )
aPool << eParam[ 3 ] << ocSep << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ];
@@ -488,7 +488,7 @@ static const struct
{ ocExact, FT_FuncFix2 },
{ ocNoName, FT_NotImpl }, // Call()
{ ocIndirect, FT_FuncFix1 },
- { ocZGZ, FT_FuncFix3 }, // Interest
+ { ocRRI, FT_FuncFix3 }, // Interest
{ ocNoName, FT_NotImpl },
{ ocNoName, FT_NotImpl },
{ ocSLN, FT_FuncFix3 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 4b040fece52c..6757a627d20f 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2236,8 +2236,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = "The future value of the investment." ;
};
};
- // -=*# Resource for function ZGZ #*=-
- Resource SC_OPCODE_ZGZ
+ // -=*# Resource for function RRI #*=-
+ Resource SC_OPCODE_RRI
{
String 1 // Description
{