[Libreoffice-commits] core.git: 6 commits - sc/source
Andras Timar
andras.timar at collabora.com
Wed Dec 3 14:24:31 PST 2014
sc/source/filter/lotus/lotform.cxx | 101 +++++++++++++++++++++++++------------
1 file changed, 69 insertions(+), 32 deletions(-)
New commits:
commit eca1d9ce9b171d8813ee19fc6fda966301f54ea6
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 23:06:37 2014 +0100
Lotus 1-2-3: fix import of mathematical functions
@EVEN, @ODD, @CSC, &CSCH, @LARGE, @SMALL, @MODULO, @ROUNDUP,
@ROUNDDOWN, @SEC, @SECH
Change-Id: I5b53bf662664a1a9adc56cb8da08b8d7a3916711
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index c9207db..e83d50a 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;
}
commit 1f0ab491cf5ccf1d05f54ab5864e10136cf59fac
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 20:28:34 2014 +0100
Lotus 1-2-3: fix import of database functions
@DCOUNT, @DPURECOUNT, @DSTD, @DSTDS, @DVAR, @DVARS, @COUNTIF, @SUMIF
Change-Id: I0aafaee6e402d9e842a44327e0dd33ffdd27e2c1
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 2393e16..c9207db 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1006,11 +1006,11 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocHLookup, // 90 Hlookup()
ocDBSum, // 91 XlfDsum
ocDBAverage, // 92 XlfDaverage
- ocDBCount, // 93 XlfDcount
+ ocDBCount2, // 93 XlfDcount
ocDBMin, // 94 XlfDmin
ocDBMax, // 95 XlfDmax
- ocDBVar, // 96 XlfDvar
- ocDBStdDev, // 97 XlfDstdev
+ ocDBVarP, // 96 XlfDvar
+ ocDBStdDevP, // 97 XlfDstdev
ocIndex, // 98 Index()
ocColumns, // 99 Cols()
ocRows, // 100 Rows()
@@ -1535,11 +1535,11 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocHLookup, // 90 Hlookup()
ocDBSum, // 91 XlfDsum
ocDBAverage, // 92 XlfDaverage
- ocDBCount, // 93 XlfDcount
+ ocDBCount2, // 93 XlfDcount
ocDBMin, // 94 XlfDmin
ocDBMax, // 95 XlfDmax
- ocDBVar, // 96 XlfDvar
- ocDBStdDev, // 97 XlfDstdev
+ ocDBVarP, // 96 XlfDvar
+ ocDBStdDevP, // 97 XlfDstdev
ocIndex, // 98 Index()
ocColumns, // 99 Cols()
ocRows, // 100 Rows()
@@ -1575,8 +1575,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 130 Reserved (internal)
ocGetActDate, // 131 Today
ocNoName, // 132 Vdb
- ocDBVarP, // 133 Dvars
- ocDBStdDevP, // 134 Dstds
+ ocDBVar, // 133 Dvars
+ ocDBStdDev, // 134 Dstds
ocVarA, // 135 Vars
ocStDevA, // 136 Stds
ocGetDiffDate360, // 137 D360
@@ -2042,6 +2042,12 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
eId=ocZZR;
else if (rTest == "CTERM")
eId=ocZZR;
+ else if (rTest == "SUMIF")
+ eId=ocSumIf;
+ else if (rTest == "COUNTIF")
+ eId=ocCountIf;
+ else if (rTest == "DPURECOUNT")
+ eId=ocDBCount;
return eId;
}
commit e20ece656156a05b684863e06e2645e02bb511b6
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 15:24:23 2014 +0100
Lotus 1-2-3: fix import of @AVG, @PUREAVG, @COUNT, @PURECOUNT
Change-Id: I6cb1925778cd841c9cad406877f64cd0228f6ddb
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index e8c8f05..2393e16 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -994,8 +994,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocGetTimeValue, // 78 Timevalue
ocNoName, // 79 Cellpointer
ocSum, // 80 Sum()
- ocAverage, // 81 Avg()
- ocCount, // 82 Cnt()
+ ocAverageA, // 81 Avg()
+ ocCount2, // 82 Cnt()
ocMinA, // 83 Min()
ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
@@ -1523,8 +1523,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocGetTimeValue, // 78 Timevalue
ocNoName, // 79 Cellpointer
ocSum, // 80 Sum()
- ocAverage, // 81 Avg()
- ocCount, // 82 Cnt()
+ ocAverageA, // 81 Avg()
+ ocCount2, // 82 Cnt()
ocMinA, // 83 Min()
ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
@@ -1595,8 +1595,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 150 Spi
ocNoName, // 151 Fullp
ocNoName, // 152 Halfp
- ocNoName, // 153 Pureavg
- ocCount2, // 154 Purecount
+ ocAverage, // 153 Pureavg
+ ocCount, // 154 Purecount
ocMax, // 155 Puremax
ocMin, // 156 Puremin
ocStDevP, // 157 Purestd
commit 3730c9e97a14c171652a12832a00b5c71eb79167
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 15:11:00 2014 +0100
Lotus 1-2-3: fix import of @VAR, @VARS, @PUREVAR, @PUREVARS
Change-Id: I728816ba2dcf3687f2fd429045b8efd4757cf222
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 6809061..e8c8f05 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1000,7 +1000,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
- ocVar, // 87 Var()
+ ocVarPA, // 87 Var()
ocStDevPA, // 88 Std()
ocIRR, // 89 Irr()
ocHLookup, // 90 Hlookup()
@@ -1529,7 +1529,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
- ocVar, // 87 Var()
+ ocVarPA, // 87 Var()
ocStDevPA, // 88 Std()
ocIRR, // 89 Irr()
ocHLookup, // 90 Hlookup()
@@ -1577,7 +1577,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 132 Vdb
ocDBVarP, // 133 Dvars
ocDBStdDevP, // 134 Dstds
- ocVarP, // 135 Vars
+ ocVarA, // 135 Vars
ocStDevA, // 136 Stds
ocGetDiffDate360, // 137 D360
ocNoName, // 138 Reserved (internal)
@@ -1600,9 +1600,9 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocMax, // 155 Puremax
ocMin, // 156 Puremin
ocStDevP, // 157 Purestd
- ocNoName, // 158 Purevar
+ ocVarP, // 158 Purevar
ocStDev, // 159 Purestds
- ocNoName, // 160 Purevars
+ ocVar, // 160 Purevars
ocNoName, // 161 Pmt2
ocNoName, // 162 Pv2
ocNoName, // 163 Fv2
commit df368fe4190f9bf511183b9bb7d08a6f6e708459
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 15:03:58 2014 +0100
Lotus 1-2-3: fix import of @STD, @STDS, @PURESTD, @PURESTDS
Change-Id: Ibc568cf60e8295da30042914182e7ca8e0296e2c
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 14aed46..6809061 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1001,7 +1001,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
ocVar, // 87 Var()
- ocNormDist, // 88 Std()
+ ocStDevPA, // 88 Std()
ocIRR, // 89 Irr()
ocHLookup, // 90 Hlookup()
ocDBSum, // 91 XlfDsum
@@ -1530,7 +1530,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
ocVar, // 87 Var()
- ocStDev, // 88 Std()
+ ocStDevPA, // 88 Std()
ocIRR, // 89 Irr()
ocHLookup, // 90 Hlookup()
ocDBSum, // 91 XlfDsum
@@ -1578,7 +1578,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocDBVarP, // 133 Dvars
ocDBStdDevP, // 134 Dstds
ocVarP, // 135 Vars
- ocStDevP, // 136 Stds
+ ocStDevA, // 136 Stds
ocGetDiffDate360, // 137 D360
ocNoName, // 138 Reserved (internal)
ocNoName, // 139 Isapp
@@ -1599,9 +1599,9 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocCount2, // 154 Purecount
ocMax, // 155 Puremax
ocMin, // 156 Puremin
- ocNoName, // 157 Purestd
+ ocStDevP, // 157 Purestd
ocNoName, // 158 Purevar
- ocNoName, // 159 Purestds
+ ocStDev, // 159 Purestds
ocNoName, // 160 Purevars
ocNoName, // 161 Pmt2
ocNoName, // 162 Pv2
commit 4979184cce19947c00ba55e050614493062c7870
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 3 14:37:58 2014 +0100
Lotus 1-2-3: fix import of @MIN, @MAX, @PUREMIN, @PUREMAX
Change-Id: Ic3b681a4fa65ac5aacac99efc4a7c10cd78ddbf1
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index f0de971..14aed46 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -996,8 +996,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocSum, // 80 Sum()
ocAverage, // 81 Avg()
ocCount, // 82 Cnt()
- ocMin, // 83 Min()
- ocMax, // 84 Max()
+ ocMinA, // 83 Min()
+ ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
ocVar, // 87 Var()
@@ -1525,8 +1525,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocSum, // 80 Sum()
ocAverage, // 81 Avg()
ocCount, // 82 Cnt()
- ocMin, // 83 Min()
- ocMax, // 84 Max()
+ ocMinA, // 83 Min()
+ ocMaxA, // 84 Max()
ocVLookup, // 85 Vlookup()
ocNPV, // 86 Npv()
ocVar, // 87 Var()
@@ -1597,8 +1597,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 152 Halfp
ocNoName, // 153 Pureavg
ocCount2, // 154 Purecount
- ocNoName, // 155 Puremax
- ocNoName, // 156 Puremin
+ ocMax, // 155 Puremax
+ ocMin, // 156 Puremin
ocNoName, // 157 Purestd
ocNoName, // 158 Purevar
ocNoName, // 159 Purestds
More information about the Libreoffice-commits
mailing list