diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 14:07:30 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-14 19:50:22 +0000 |
| commit | b08f87b62db81b498ea71e5e1049b96e3dc42da4 (patch) | |
| tree | f3e17ba0432463e0853b9ca4a873d57d0a030a33 /formula | |
| parent | 97507ca728376e74c1092f8eccf431bd49cd4368 (diff) | |
fdo#85818: rename ZW to FV
Change-Id: I464cba72153ef70bbb14bf43a448a28d02095728
Reviewed-on: https://gerrit.libreoffice.org/13868
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/api/token.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index d1ef9a958188..55a1063b1f75 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -99,7 +99,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocVBD: case ocSLN: case ocPMT: - case ocZW: + case ocFV: case ocIpmt: case ocPpmt: case ocCumIpmt: diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 82cdcf210718..0ae70594c2db 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1260,7 +1260,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin case ocPpmt: return AddDefaultArg( pNewArr, 4, 0.0 ); case ocPV: - case ocZW: // FV + case ocFV: bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v break; diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 8a90a9cee238..ecdccb557df4 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -226,7 +226,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "SHEET" ; }; String SC_OPCODE_RRI { Text = "RRI" ; }; - String SC_OPCODE_ZW { Text = "FV" ; }; + String SC_OPCODE_FV { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; @@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "_xlfn.SHEET" ; }; String SC_OPCODE_RRI { Text = "_xlfn.RRI" ; }; - String SC_OPCODE_ZW { Text = "FV" ; }; + String SC_OPCODE_FV { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; @@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "SHEET" ; }; String SC_OPCODE_RRI { Text = "ZGZ" ; }; - String SC_OPCODE_ZW { Text = "FV" ; }; + String SC_OPCODE_FV { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; @@ -1990,7 +1990,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "RRI" ; }; - String SC_OPCODE_ZW + String SC_OPCODE_FV { Text [ en-US ] = "FV" ; }; |