commit 0ee11c3f55ec1285d8febc065bda44224052eaae
author Eike Rathke <erack@redhat.com> Thu Nov 01 16:40:31 2018 +0100
committer Eike Rathke <erack@redhat.com> Thu Nov 01 18:01:26 2018 +0100
tree 08669487a83ccfb95df7fff188ac8be19ccc3627
parent a626bdd56d7116efa57e65403ad51b56657148c3

Add REGEX() 4th parameter also to Excel import/export, tdf#113977

Change-Id: I5c849c8646711d3de74b91d804e39cdcc20e30fe
Reviewed-on: https://gerrit.libreoffice.org/62743
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

sc/source/filter/excel/xlformula.cxx

diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 2af5523..459c913 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -640,7 +640,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] =
    EXC_FUNCENTRY_OOO( ocForecast_ETS_PIM, 3,  7,  0,  "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ),
    EXC_FUNCENTRY_OOO( ocForecast_ETS_STM, 3,  6,  0,  "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ),
    EXC_FUNCENTRY_OOO( ocRoundSig,      2,  2,  0,  "ORG.LIBREOFFICE.ROUNDSIG" ),
    EXC_FUNCENTRY_OOO( ocRegex,         2,  3,  0,  "ORG.LIBREOFFICE.REGEX" )
    EXC_FUNCENTRY_OOO( ocRegex,         2,  4,  0,  "ORG.LIBREOFFICE.REGEX" )
};

#undef EXC_FUNCENTRY_OOO_IBR

sc/source/filter/oox/formulabase.cxx

diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index be09c75..4a11eef 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -911,7 +911,7 @@ static const FunctionData saFuncTableOOoLO[] =
    { "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT",   "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT",   NOID,   NOID,   4,  7,  V, { VR, VA, VR }, FuncFlags::MACROCALL_NEW },
    { "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT", "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT", NOID,   NOID,   3,  6,  V, { VR, VA, VR }, FuncFlags::MACROCALL_NEW },
    { "ORG.LIBREOFFICE.ROUNDSIG",   "ORG.LIBREOFFICE.ROUNDSIG", NOID, NOID,  2,  2,  V, { RX }, FuncFlags::MACROCALL_NEW },
    { "ORG.LIBREOFFICE.REGEX",      "ORG.LIBREOFFICE.REGEX", NOID, NOID,  2,  3,  V, { RX }, FuncFlags::MACROCALL_NEW }
    { "ORG.LIBREOFFICE.REGEX",      "ORG.LIBREOFFICE.REGEX", NOID, NOID,  2,  4,  V, { RX }, FuncFlags::MACROCALL_NEW }

};