diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-12-03 23:06:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-03 23:23:46 +0100 |
| commit | eca1d9ce9b171d8813ee19fc6fda966301f54ea6 (patch) | |
| tree | 4587e5bb80e121d3674bf41515419879aefa741a /sc | |
| parent | 1f0ab491cf5ccf1d05f54ab5864e10136cf59fac (diff) | |
Lotus 1-2-3: fix import of mathematical functions
@EVEN, @ODD, @CSC, &CSCH, @LARGE, @SMALL, @MODULO, @ROUNDUP,
@ROUNDDOWN, @SEC, @SECH
Change-Id: I5b53bf662664a1a9adc56cb8da08b8d7a3916711
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/lotus/lotform.cxx | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c9207db7a64a..e83d50ad8344 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -161,6 +161,19 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri } } break; + case ocRoundUp: + case ocRoundDown: + { + // omit optional 3rd parameter + if ( nAnz == 3 ) + { + eParam[ 0 ] = eParam[ 1 ]; + eParam[ 1 ] = eParam[ 2 ]; + nAnz = 2; + } + + } + break; default:; } @@ -1999,9 +2012,9 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest ) else if (rTest == "TANH") eId=ocTanHyp; else if (rTest == "EVEN") - eId=ocIsEven; + eId=ocEven; else if (rTest == "ODD") - eId=ocIsOdd; + eId=ocOdd; else if (rTest == "ACOT") eId=ocArcCot; else if (rTest == "COT") @@ -2048,6 +2061,24 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest ) eId=ocCountIf; else if (rTest == "DPURECOUNT") eId=ocDBCount; + else if (rTest == "CSC") + eId=ocCosecant; + else if (rTest == "CSCH") + eId=ocCosecantHyp; + else if (rTest == "LARGE") + eId=ocLarge; + else if (rTest == "SMALL") + eId=ocSmall; + else if (rTest == "MODULO") + eId=ocMod; + else if (rTest == "ROUNDDOWN") + eId=ocRoundDown; + else if (rTest == "ROUNDUP") + eId=ocRoundUp; + else if (rTest == "SEC") + eId=ocSecant; + else if (rTest == "SECH") + eId=ocSecantHyp; return eId; } |