diff options
| author | Eike Rathke <erack@redhat.com> | 2013-11-29 21:45:50 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-11-29 21:49:58 +0100 |
| commit | 7646af0e114d0a644e4705bba3ab4219bb99a349 (patch) | |
| tree | 15d847865305ba06a290796899f4160e3be20a16 | |
| parent | 3367381d2b579d90b209756f9ec5c06b012e9798 (diff) | |
our UI DURATION is ODF and Excel PDURATION
Change-Id: Iaf0e5f8096554b8b5d80265b6dc5296b3294f134
(cherry picked from commit 62e1a27dc757637223f5f18b1a340ba138e0cb82)
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index afb1d15f31b8..44b5fd1b2fae 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -581,7 +581,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_GDA { Text = "DDB" ; }; String SC_OPCODE_GDA_2 { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_LAUFZ { Text = "_xlfn.DURATION" ; }; + String SC_OPCODE_LAUFZ { Text = "_xlfn.PDURATION" ; }; String SC_OPCODE_LIA { Text = "SLN" ; }; String SC_OPCODE_RMZ { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index ef8c92622562..26a623e4adf8 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -623,7 +623,7 @@ static const FunctionData saFuncTableBiff4[] = { "COUPNCD", "COUPNCD", 455, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL }, { "COUPNUM", "COUPNUM", 456, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL }, { "COUPPCD", "COUPPCD", 457, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL }, - { "DURATION", "DURATION", 458, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in + { "DURATION", "DURATION", 458, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in (but different!) { "MDURATION", "MDURATION", 459, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL }, { "ODDLPRICE", "ODDLPRICE", 460, NOID, 7, 8, V, { RR }, FUNCFLAG_EXTERNAL }, { "ODDLYIELD", "ODDLYIELD", 461, NOID, 8, 9, V, { RR }, FUNCFLAG_EXTERNAL }, |