formula/source/core/api/FormulaCompiler.cxx | 2 +- formula/source/core/api/token.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/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/qpro/qproform.cxx | 4 ++-- sc/source/ui/src/scfuncs.src | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 2963dbb5ce65a141051cb3e4e3ed06a6ed31574c Author: Laurent Charrière <lcharri...@gmail.com> Date: Wed Jan 7 10:36:27 2015 +0100 fdo#85818: rename ZinsZ enum name, constant, function to Ipmt Rename OcZinsZ to OcIpmt, SC_OPCODE_ZINS_Z to SC_OPCODE_IPMT, ScInterpreter::ScZinsZ() to ScInterpreter::ScIpmt() Change-Id: I6ed671aff85b7d2ec06dd66cd7ec9390776008b1 Reviewed-on: https://gerrit.libreoffice.org/13813 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 69afa63..b8380b8 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -100,7 +100,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocLIA: case ocRMZ: case ocZW: - case ocZinsZ: + case ocIpmt: case ocKapz: case ocKumZinsZ: case ocKumKapZ: diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ec9f4d3..1403dfa 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1256,7 +1256,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin case ocBetaInv: case ocRMZ: // PMT return AddDefaultArg( pNewArr, 3, 0.0 ); - case ocZinsZ: // IPMT + case ocIpmt: case ocKapz: // PPMT return AddDefaultArg( pNewArr, 4, 0.0 ); case ocBW: // PV @@ -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 ocRate: // RATE + case ocRate: 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 408d083..af72798 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -228,7 +228,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -635,7 +635,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -1995,7 +1995,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "RATE" ; }; - String SC_OPCODE_ZINS_Z + String SC_OPCODE_IPMT { Text [ en-US ] = "IPMT" ; }; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 8767082..f8631ef 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -257,7 +257,7 @@ #define SC_OPCODE_ZW 257 #define SC_OPCODE_ZZR 258 #define SC_OPCODE_RATE 259 -#define SC_OPCODE_ZINS_Z 260 +#define SC_OPCODE_IPMT 260 #define SC_OPCODE_KAPZ 261 #define SC_OPCODE_KUM_ZINS_Z 262 #define SC_OPCODE_KUM_KAP_Z 263 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 6ae2788..7b80786 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -261,7 +261,7 @@ enum OpCode : sal_uInt16 ocZW = SC_OPCODE_ZW, ocZZR = SC_OPCODE_ZZR, ocRate = SC_OPCODE_RATE, - ocZinsZ = SC_OPCODE_ZINS_Z, + ocIpmt = SC_OPCODE_IPMT, ocKapz = SC_OPCODE_KAPZ, ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z, ocKumKapZ = SC_OPCODE_KUM_KAP_Z, diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 6179cf7..c5bdade 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -684,7 +684,7 @@ bool RateIteration(double fNper, double fPayment, double fPv, void ScRate(); double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw, double fZw, double fF, double& fRmz); -void ScZinsZ(); +void ScIpmt(); void ScKapz(); void ScKumZinsZ(); void ScKumKapZ(); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index d90cce9..e57799d 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2442,7 +2442,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpPhi, nResultSize)); break; - case ocZinsZ: + case ocIpmt: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpIPMT, nResultSize)); break; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index ab1b4f2..ef519d4 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1732,7 +1732,7 @@ double ScInterpreter::ScGetCompoundInterest(double fInterest, double fZr, double return fCompoundInterest * fInterest; } -void ScInterpreter::ScZinsZ() +void ScInterpreter::ScIpmt() { double nInterest, nZr, nZzr, nBw, nZw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index ea46b0e..917d9e4 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4044,7 +4044,7 @@ StackVar ScInterpreter::Interpret() case ocColor : ScColor(); break; case ocErf_MS : ScErf(); break; case ocErfc_MS : ScErfc(); break; - case ocZinsZ : ScZinsZ(); break; + case ocIpmt : ScIpmt(); break; case ocKapz : ScKapz(); break; case ocKumZinsZ : ScKumZinsZ(); break; case ocKumKapZ : ScKumKapZ(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index eba1d29..906d782 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1217,7 +1217,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocVariationen: case ocVariationen2: case ocPhi: - case ocZinsZ: + case ocIpmt: case ocConfidence: case ocIntercept: case ocGDA2: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 0470a55..ce8c3dd 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -197,7 +197,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocMatDet, 163, 1, 1, V, { VA }, 0, 0 }, { ocMatInv, 164, 1, 1, A, { VA }, 0, 0 }, { ocMatMult, 165, 2, 2, A, { VA }, 0, 0 }, - { ocZinsZ, 167, 4, 6, V, { VR }, 0, 0 }, + { ocIpmt, 167, 4, 6, V, { VR }, 0, 0 }, { ocKapz, 168, 4, 6, V, { VR }, 0, 0 }, { ocCount2, 169, 0, MX, V, { RX }, 0, 0 }, { ocProduct, 183, 0, MX, V, { RX }, 0, 0 }, diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 7883c99b8..d38b704 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -137,7 +137,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr if( eOc == ocZGZ ) aPool << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ]; - if( eOc == ocZinsZ ) + if( eOc == ocIpmt ) aPool << eParam[ 3 ] << ocSep << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ]; else { @@ -503,7 +503,7 @@ static const struct { ocZW, FT_FuncFix3 }, // QPro Fval // 0x80 { ocZZR, FT_FuncFix5 }, { ocRate, FT_FuncFix5 }, - { ocZinsZ, FT_FuncFix4 }, + { ocIpmt, FT_FuncFix4 }, { ocKapz, FT_FuncFix6 }, { ocSumProduct, FT_FuncFix2 }, { ocNoName, FT_NotImpl }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index a78b5c4..069b42b 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1453,7 +1453,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 }; }; // -=*# Resource for function ZINSZ #*=- - Resource SC_OPCODE_ZINS_Z + Resource SC_OPCODE_IPMT { String 1 // Description {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits