[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - formula/source sc/source

[Eike Rathke]

 formula/source/core/resource/core_resource.src |    2 +-
 sc/source/filter/oox/formulabase.cxx           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7646af0e114d0a644e4705bba3ab4219bb99a349
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Nov 29 21:45:50 2013 +0100

    our UI DURATION is ODF and Excel PDURATION
    
    Change-Id: Iaf0e5f8096554b8b5d80265b6dc5296b3294f134
    (cherry picked from commit 62e1a27dc757637223f5f18b1a340ba138e0cb82)

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index afb1d15..44b5fd1 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 ef8c926..26a623e 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 },