formula/source/core/api/FormulaCompiler.cxx | 2 +-
formula/source/core/api/token.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/opencl/formulagroupcl.cxx | 2 +-
sc/source/core/tool/interpr2.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/token.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/filter/lotus/lotform.cxx | 6 +++---
sc/source/filter/qpro/qproform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 1f4fd70495b3d0e732447e8e60e5faa9086471a8
Author: Laurent Charrière <lcharri...@gmail.com>
Date: Tue Jan 6 21:10:31 2015 +0100
fdo#85818: rename 'Zins' enum name, constant, function to Rate
Rename OcZins to OcRate, SC_OPCODE_ZINS to SC_OPCODE_RATE,
ScInterpreter::ScZins() to ScInterpreter::ScRate()
(partial fix for fdo#85818, more constants remain to be renamed)
Change-Id: Icd5d0df14f2583da7ebd0308dc660abd07f326a4
Reviewed-on: https://gerrit.libreoffice.org/13777
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index f5b1b9a..69afa63 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -105,7 +105,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocKumZinsZ:
case ocKumKapZ:
return NUMBERFORMAT_CURRENCY;
- case ocZins:
+ case ocRate:
case ocIRR:
case ocMIRR:
case ocZGZ:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 2f6ae97..ec9f4d3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1264,7 +1264,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
break;
- case ocZins: // RATE
+ case ocRate: // RATE
bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv
bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 99b387d..408d083 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -227,7 +227,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ZGZ { Text = "RRI" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
- String SC_OPCODE_ZINS { Text = "RATE" ; };
+ String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
String SC_OPCODE_KAPZ { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ZGZ { Text = "_xlfn.RRI" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
- String SC_OPCODE_ZINS { Text = "RATE" ; };
+ String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
String SC_OPCODE_KAPZ { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -1043,7 +1043,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ZGZ { Text = "ZGZ" ; };
String SC_OPCODE_ZW { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
- String SC_OPCODE_ZINS { Text = "RATE" ; };
+ String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_ZINS_Z { Text = "IPMT" ; };
String SC_OPCODE_KAPZ { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
@@ -1991,7 +1991,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "NPER" ;
};
- String SC_OPCODE_ZINS
+ String SC_OPCODE_RATE
{
Text [ en-US ] = "RATE" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index bd1ad39..8767082 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -256,7 +256,7 @@
#define SC_OPCODE_ZGZ 256
#define SC_OPCODE_ZW 257
#define SC_OPCODE_ZZR 258
-#define SC_OPCODE_ZINS 259
+#define SC_OPCODE_RATE 259
#define SC_OPCODE_ZINS_Z 260
#define SC_OPCODE_KAPZ 261
#define SC_OPCODE_KUM_ZINS_Z 262
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 0626ed5..6ae2788 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -260,7 +260,7 @@ enum OpCode : sal_uInt16
ocZGZ = SC_OPCODE_ZGZ,
ocZW = SC_OPCODE_ZW,
ocZZR = SC_OPCODE_ZZR,
- ocZins = SC_OPCODE_ZINS,
+ ocRate = SC_OPCODE_RATE,
ocZinsZ = SC_OPCODE_ZINS_Z,
ocKapz = SC_OPCODE_KAPZ,
ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index b9fd9a2..6179cf7 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -681,7 +681,7 @@ void ScZW();
void ScZZR();
bool RateIteration(double fNper, double fPayment, double fPv,
double fFv, double fPayType, double& fGuess);
-void ScZins();
+void ScRate();
double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw,
double fZw, double fF, double& fRmz);
void ScZinsZ();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index b6d32a7..92567aa 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2401,7 +2401,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
case ocRMZ:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new
OpPMT, nResultSize));
break;
- case ocZins:
+ case ocRate:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new
OpIntrate, nResultSize));
break;
case ocZGZ:
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index df28b08..ab1b4f2 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1646,7 +1646,7 @@ bool ScInterpreter::RateIteration( double fNper, double
fPayment, double fPv,
}
// In Calc UI it is the function RATE(Nper;Pmt;Pv;Fv;Type;Guess)
-void ScInterpreter::ScZins()
+void ScInterpreter::ScRate()
{
double fPv, fPayment, fNper;
// defaults for missing arguments, see ODFF spec
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 2b2dd65..ea46b0e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4038,7 +4038,7 @@ StackVar ScInterpreter::Interpret()
case ocZGZ : ScZGZ(); break;
case ocZW : ScZW(); break;
case ocZZR : ScZZR(); break;
- case ocZins : ScZins(); break;
+ case ocRate : ScRate(); break;
case ocFilterXML : ScFilterXML(); break;
case ocWebservice : ScWebservice(); break;
case ocColor : ScColor(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index cd9e656..cff4913 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1171,7 +1171,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocIRR:
case ocMIRR:
case ocRMZ:
- case ocZins:
+ case ocRate:
case ocZGZ:
case ocKapz:
case ocFisher:
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index c5ff980..0470a55 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -138,7 +138,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocZW, 57, 3, 5, V, { VR }, 0, 0 },
{ ocZZR, 58, 3, 5, V, { VR }, 0, 0 },
{ ocRMZ, 59, 3, 5, V, { VR }, 0, 0 },
- { ocZins, 60, 3, 6, V, { VR }, 0, 0 },
+ { ocRate, 60, 3, 6, V, { VR }, 0, 0 },
{ ocMIRR, 61, 3, 3, V, { RA, VR }, 0, 0 },
{ ocIRR, 62, 1, 2, V, { RA, VR }, 0, 0 },
{ ocRandom, 63, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index e83d50a..9f6f2a5 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -125,7 +125,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz,
const sal_Char* pExtStri
IncToken( eParam[ nAnz - 2 ] );
}
break;
- case ocZins:
+ case ocRate:
{
// new quantity = 4!
OSL_ENSURE( nAnz == 3,
@@ -1042,7 +1042,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocExact, // 113 Exact()
ocNoName, // 114 Call()
ocIndirect, // 115 @@()
- ocZins, // 116 Rate()
+ ocRate, // 116 Rate()
ocNoName, // 117 Term()
ocNoName, // 118 Cterm()
ocLIA, // 119 Sln()
@@ -1571,7 +1571,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex
)
ocExact, // 113 Exact()
ocNoName, // 114 Call()
ocIndirect, // 115 @@()
- ocZins, // 116 Rate()
+ ocRate, // 116 Rate()
ocNoName, // 117 Term()
ocNoName, // 118 Cterm()
ocLIA, // 119 Sln()
diff --git a/sc/source/filter/qpro/qproform.cxx
b/sc/source/filter/qpro/qproform.cxx
index 6be47b0..7883c99b8 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -502,7 +502,7 @@ static const struct
{ ocRMZ, FT_FuncFix5 }, // QPro Paymt
{ ocZW, FT_FuncFix3 }, // QPro Fval // 0x80
{ ocZZR, FT_FuncFix5 },
- { ocZins, FT_FuncFix5 },
+ { ocRate, FT_FuncFix5 },
{ ocZinsZ, FT_FuncFix4 },
{ ocKapz, FT_FuncFix6 },
{ ocSumProduct, FT_FuncFix2 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 305835e..a78b5c4 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1389,7 +1389,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function ZINS #*=-
- Resource SC_OPCODE_ZINS
+ Resource SC_OPCODE_RATE
{
String 1 // Description
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
