formula/source/core/api/FormulaCompiler.cxx | 4 ++--
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/opencl/formulagroupcl.cxx | 2 +-
sc/source/core/tool/compiler.cxx | 2 +-
sc/source/core/tool/interpr2.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/parclass.cxx | 2 +-
sc/source/core/tool/token.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/filter/qpro/qproform.cxx | 4 ++--
sc/source/ui/src/scfuncs.src | 4 ++--
14 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 92cef7eb344c9c9c7a6aa1489845a1b0eb346ead
Author: Laurent Charrière <lcharri...@gmail.com>
Date: Fri Jan 9 13:43:55 2015 +0100
fdo#85818: rename ZGZ to RRI
Change-Id: Ifeb513eba762f881dd4ea7cd7fc531fe5028106d
Reviewed-on: https://gerrit.libreoffice.org/13831
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 5d289fb..d1ef9a9 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -108,7 +108,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocRate:
case ocIRR:
case ocMIRR:
- case ocZGZ:
+ case ocRRI:
case ocEffective:
case ocNominal:
case ocPercentSign:
@@ -917,7 +917,7 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap&
r, bool bOverrideKno
OpCode eOp = OpCode(i);
switch (eOp)
{
- case ocZGZ:
+ case ocRRI:
aSymbol = "RRI";
break;
case ocTableOp:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 81cafdf..1e76de2 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -224,7 +224,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_COLUMN { Text = "COLUMN" ; };
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "SHEET" ; };
- String SC_OPCODE_ZGZ { Text = "RRI" ; };
+ String SC_OPCODE_RRI { Text = "RRI" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
@@ -631,7 +631,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_COLUMN { Text = "COLUMN" ; };
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "_xlfn.SHEET" ; };
- String SC_OPCODE_ZGZ { Text = "_xlfn.RRI" ; };
+ String SC_OPCODE_RRI { Text = "_xlfn.RRI" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
@@ -1040,7 +1040,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_COLUMN { Text = "COLUMN" ; };
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "SHEET" ; };
- String SC_OPCODE_ZGZ { Text = "ZGZ" ; };
+ String SC_OPCODE_RRI { Text = "ZGZ" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
@@ -1979,7 +1979,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "SHEET" ;
};
- String SC_OPCODE_ZGZ
+ String SC_OPCODE_RRI
{
Text [ en-US ] = "RRI" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index a512e28..5686a8b 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -253,7 +253,7 @@
#define SC_OPCODE_ROWS 253
#define SC_OPCODE_COLUMN 254
#define SC_OPCODE_ROW 255
-#define SC_OPCODE_ZGZ 256
+#define SC_OPCODE_RRI 256
#define SC_OPCODE_ZW 257
#define SC_OPCODE_ZZR 258
#define SC_OPCODE_RATE 259
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 5349559..c9e105d 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -257,7 +257,7 @@ enum OpCode : sal_uInt16
ocRows = SC_OPCODE_ROWS,
ocColumn = SC_OPCODE_COLUMN,
ocRow = SC_OPCODE_ROW,
- ocZGZ = SC_OPCODE_ZGZ,
+ ocRRI = SC_OPCODE_RRI,
ocZW = SC_OPCODE_ZW,
ocZZR = SC_OPCODE_ZZR,
ocRate = SC_OPCODE_RATE,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6f6b75c..9904cbc 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 d9295bf..a327d1f 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 9ae1474..4ac0951 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 5a62b44..038e679 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 ea532ae..ff4639e 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 2ebdfdf..b066c5c 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 8d01d04..072af24 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 01f54c8..31b70a4 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 2372b6a..3121eb2 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 4b040fe..6757a62 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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
