diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2015-09-22 10:40:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-10-06 21:21:16 +0000 |
| commit | f830600ece806ec365a4839e79afabe183c5e36d (patch) | |
| tree | 1bcfeccf135fc1489b1f850ca3462df514f5b294 /sc/source/filter/oox | |
| parent | Prefer getSelectedFiles to getFiles (vcl) (diff) | |
| download | core-f830600ece806ec365a4839e79afabe183c5e36d.tar.gz core-f830600ece806ec365a4839e79afabe183c5e36d.zip | |
tdf#50950 Add ODFF1.2 Calc function ISOWEEKNUM,
make Calc function WEEKNUM compliant with ODFF1.2,
provide backward compatibility for Calc function WEEKNUM,
add unit tests for ISOWEEKNUM, WEEKNUM and backward compatibility.
Change-Id: I63af5543cea2f470d710462e55404ac754022c89
Reviewed-on: https://gerrit.libreoffice.org/18760
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/filter/oox')
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index b4bcb25a0020..cdfc9227056b 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -876,9 +876,7 @@ static const FunctionData saFuncTable2013[] = { "IMSINH", "IMSINH", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL }, { "IMTAN", "IMTAN", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL }, { "ISFORMULA", "ISFORMULA", NOID, NOID, 1, 1, V, { RO }, FUNCFLAG_MACROCALL_NEW }, - /* FIXME: ISOWEEKNUM vs. WEEKNUM mess needs to be sorted out before we can - * import. */ - { 0/*"ISOWEEKNUM"*/, "ISOWEEKNUM", NOID, NOID, 1, 2, V, { VR }, FUNCFLAG_MACROCALL_NEW }, + { "ISOWEEKNUM", "ISOWEEKNUM", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW }, { "MUNIT", "MUNIT", NOID, NOID, 1, 1, A, { VR }, FUNCFLAG_MACROCALL_NEW }, { "NUMBERVALUE", "NUMBERVALUE", NOID, NOID, 1, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, { "PDURATION", "PDURATION", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, |