diff options
| author | Eike Rathke <erack@redhat.com> | 2016-06-27 15:59:40 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-06-27 16:03:23 +0200 |
| commit | d480e5c7f68d61cf51c233f62c07293f212b9f4a (patch) | |
| tree | 91c52ebe4c0f2ed4da259a62dd168f874a9e2083 /formula | |
| parent | fd07d67bea790b9885322e7124e07506aa50e170 (diff) | |
rename *effective to *effect, tdf#100641 related
... to unify naming.
Change-Id: I0964822d53eafd69ea4ed0656dfdfcb3f5bfd561
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 675da4bb422a..1379cba1aed1 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -109,7 +109,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocIRR: case ocMIRR: case ocRRI: - case ocEffective: + case ocEffect: case ocNominal: case ocPercentSign: return css::util::NumberFormat::PERCENT; diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index c781fa02df94..2124218ae5f7 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -238,7 +238,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; }; String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; }; - String SC_OPCODE_EFFECTIVE { Text = "EFFECT" ; }; + String SC_OPCODE_EFFECT { Text = "EFFECT" ; }; String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; }; String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; }; String SC_OPCODE_DB_SUM { Text = "DSUM" ; }; @@ -678,7 +678,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; }; String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; }; - String SC_OPCODE_EFFECTIVE { Text = "EFFECT" ; }; + String SC_OPCODE_EFFECT { Text = "EFFECT" ; }; String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; }; String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; }; String SC_OPCODE_DB_SUM { Text = "DSUM" ; }; @@ -1118,7 +1118,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; }; String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; }; - String SC_OPCODE_EFFECTIVE { Text = "EFFECTIVE" ; }; + String SC_OPCODE_EFFECT { Text = "EFFECTIVE" ; }; String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; }; String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; }; String SC_OPCODE_DB_SUM { Text = "DSUM" ; }; @@ -2142,7 +2142,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "CUMPRINC" ; }; - String SC_OPCODE_EFFECTIVE + String SC_OPCODE_EFFECT { Text [ en-US ] = "EFFECT" ; }; |