diff options
author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 13:22:08 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:55:20 +0000 |
commit | 294b1e93f4a9e70e0699b2b42eba03eed630ec0c (patch) | |
tree | 67373ecf33ef688d72077f97d5723ff1e99a7a68 | |
parent | fd66d3749e286d8e1b40429ea04e33d7266c1132 (diff) |
fdo#85818: rename LIA to SLN
Change-Id: Ifbf9be5fae60a6460596b90ce87e9ace45b2098f
Reviewed-on: https://gerrit.libreoffice.org/13829
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.src | 8 | ||||
-rw-r--r-- | include/formula/compiler.hrc | 2 | ||||
-rw-r--r-- | include/formula/opcode.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/inc/interpre.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr2.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/lotus/lotform.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/qpro/qproform.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/src/scfuncs.src | 4 |
13 files changed, 18 insertions, 18 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index ec53ee664fb8..50bfd821a314 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -97,7 +97,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocDDB: case ocDB: case ocVBD: - case ocLIA: + case ocSLN: case ocRMZ: case ocZW: case ocIpmt: diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 6ed8e2d4d1c2..c64be1fd492c 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -216,7 +216,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; String SC_OPCODE_DURATION { Text = "PDURATION" ; }; - String SC_OPCODE_LIA { Text = "SLN" ; }; + String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_RMZ { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; String SC_OPCODE_ROWS { Text = "ROWS" ; }; @@ -623,7 +623,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; String SC_OPCODE_DURATION { Text = "_xlfn.PDURATION" ; }; - String SC_OPCODE_LIA { Text = "SLN" ; }; + String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_RMZ { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; String SC_OPCODE_ROWS { Text = "ROWS" ; }; @@ -1032,7 +1032,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; String SC_OPCODE_DURATION { Text = "DURATION" ; }; - String SC_OPCODE_LIA { Text = "SLN" ; }; + String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_RMZ { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; String SC_OPCODE_ROWS { Text = "ROWS" ; }; @@ -1947,7 +1947,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "DURATION" ; }; - String SC_OPCODE_LIA + String SC_OPCODE_SLN { Text [ en-US ] = "SLN" ; }; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 7e9facbc9cd6..bfbcc70a16b8 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -247,7 +247,7 @@ #define SC_OPCODE_DB 247 #define SC_OPCODE_VBD 248 #define SC_OPCODE_DURATION 249 -#define SC_OPCODE_LIA 250 +#define SC_OPCODE_SLN 250 #define SC_OPCODE_RMZ 251 #define SC_OPCODE_COLUMNS 252 #define SC_OPCODE_ROWS 253 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 2fed5558555a..4ca9893f9175 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -251,7 +251,7 @@ enum OpCode : sal_uInt16 ocDB = SC_OPCODE_DB, ocVBD = SC_OPCODE_VBD, ocDuration = SC_OPCODE_DURATION, - ocLIA = SC_OPCODE_LIA, + ocSLN = SC_OPCODE_SLN, ocRMZ = SC_OPCODE_RMZ, ocColumns = SC_OPCODE_COLUMNS, ocRows = SC_OPCODE_ROWS, diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 2e7e32519ef9..d761a3f680e0 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -670,7 +670,7 @@ double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, double fPeriode,double fFactor); void ScVDB(); void ScDuration(); -void ScLIA(); +void ScSLN(); double ScGetRmz(double fZins, double fZzr, double fBw, double fZw, double fF); void ScRMZ(); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 1116e969de87..e3704bd0cfbe 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2283,7 +2283,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( case ocGamma: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpGamma, nResultSize)); break; - case ocLIA: + case ocSLN: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpSLN, nResultSize)); break; case ocGammaLn: diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 78ce44c54e58..4cfc8baafffb 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1434,7 +1434,7 @@ void ScInterpreter::ScDuration() } } -void ScInterpreter::ScLIA() +void ScInterpreter::ScSLN() { nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 3 ) ) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 27309a7c42a8..badbd9a7cfe5 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4027,7 +4027,7 @@ StackVar ScInterpreter::Interpret() case ocDB : ScDB(); break; case ocVBD : ScVDB(); break; case ocDuration : ScDuration(); break; - case ocLIA : ScLIA(); break; + case ocSLN : ScSLN(); break; case ocRMZ : ScRMZ(); break; case ocColumns : ScColumns(); break; case ocRows : ScRows(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 7edd0d182a91..b305b8a67c6e 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1167,7 +1167,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocCount: case ocCount2: case ocVLookup: - case ocLIA: + case ocSLN: case ocIRR: case ocMIRR: case ocRMZ: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index af5ed568b640..4deb1253f50e 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -189,7 +189,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocN, 131, 1, 1, V, { RO }, 0, 0 }, { ocGetDateValue, 140, 1, 1, V, { VR }, 0, 0 }, { ocGetTimeValue, 141, 1, 1, V, { VR }, 0, 0 }, - { ocLIA, 142, 3, 3, V, { VR }, 0, 0 }, + { ocSLN, 142, 3, 3, V, { VR }, 0, 0 }, { ocSYD, 143, 4, 4, V, { VR }, 0, 0 }, { ocDDB, 144, 4, 5, V, { VR }, 0, 0 }, { ocIndirect, 148, 1, 2, R, { VR }, EXC_FUNCFLAG_VOLATILE, 0 }, diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c2dd7a75841b..550f66aa5ee0 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -1045,7 +1045,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) ocRate, // 116 Rate() ocNoName, // 117 Term() ocNoName, // 118 Cterm() - ocLIA, // 119 Sln() + ocSLN, // 119 Sln() ocSYD, // 120 Syd(), Soy() ocDDB, // 121 Ddb() ocNoName, // 122 @@ -1574,7 +1574,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocRate, // 116 Rate() ocNoName, // 117 Term() ocNoName, // 118 Cterm() - ocLIA, // 119 Sln() + ocSLN, // 119 Sln() ocSYD, // 120 Syd(), Soy() ocDDB, // 121 Ddb() ocNoName, // 122 Splfunc diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index bde978e96eb6..91f854d3517d 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -491,7 +491,7 @@ static const struct { ocZGZ, FT_FuncFix3 }, // Interest { ocNoName, FT_NotImpl }, { ocNoName, FT_NotImpl }, - { ocLIA, FT_FuncFix3 }, + { ocSLN, FT_FuncFix3 }, { ocSYD, FT_FuncFix4 }, { ocDDB, FT_FuncFix4 }, { ocStDevP, FT_FuncVar }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 24ff46f2b793..86b7608c60be 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1756,8 +1756,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Period. The depreciation period which must have the same time unit as average useful life." ; }; }; - // -=*# Resource for function LIA #*=- - Resource SC_OPCODE_LIA + // -=*# Resource for function SLN #*=- + Resource SC_OPCODE_SLN { String 1 // Description { |