diff options
author | Raal <raal@post.cz> | 2014-12-31 08:22:05 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-31 08:28:41 +0100 |
commit | 56ed2a8c24660442bcf42358395acc00bfa595da (patch) | |
tree | c7d72a5d7b9deda7356f9af9ea32b0ee8ddbcab8 | |
parent | 1834de0a125a72cf32907b0586b8ceb4930ec411 (diff) |
add a few more formula tests
Change-Id: I3471227b97802d5f3cf5d41f5530d28163fee37d
-rw-r--r-- | sc/qa/unit/data/contentCSV/financial-functions.csv | 3 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/information-functions.csv | 2 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/logical-functions.csv | 3 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/mathematical-functions.csv | 58 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/spreadsheet-functions.csv | 16 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/statistical-functions.csv | 153 | ||||
-rw-r--r-- | sc/qa/unit/data/contentCSV/text-functions.csv | 3 | ||||
-rw-r--r-- | sc/qa/unit/data/ods/functions.ods | bin | 34238 -> 35118 bytes | |||
-rw-r--r-- | sc/source/core/data/dociter.cxx | 2 |
9 files changed, 236 insertions, 4 deletions
diff --git a/sc/qa/unit/data/contentCSV/financial-functions.csv b/sc/qa/unit/data/contentCSV/financial-functions.csv index 814df6b57d4b..540d0959bf4b 100644 --- a/sc/qa/unit/data/contentCSV/financial-functions.csv +++ b/sc/qa/unit/data/contentCSV/financial-functions.csv @@ -53,3 +53,6 @@ 8603.80245372397 0.194818475056105 332.570918796713 +0.0650000069 +0.0609543337 +0.052822572 diff --git a/sc/qa/unit/data/contentCSV/information-functions.csv b/sc/qa/unit/data/contentCSV/information-functions.csv index 660c910383fc..876951eb81ab 100644 --- a/sc/qa/unit/data/contentCSV/information-functions.csv +++ b/sc/qa/unit/data/contentCSV/information-functions.csv @@ -16,3 +16,5 @@ FALSE,TRUE,FALSE,TRUE 0,1,42,0 #N/A 1,2,8,64,16 +TRUE,FALSE +FALSE,TRUE diff --git a/sc/qa/unit/data/contentCSV/logical-functions.csv b/sc/qa/unit/data/contentCSV/logical-functions.csv index fd348f745069..902009be6b4f 100644 --- a/sc/qa/unit/data/contentCSV/logical-functions.csv +++ b/sc/qa/unit/data/contentCSV/logical-functions.csv @@ -1,6 +1,7 @@ FALSE,FALSE,FALSE,TRUE,FALSE FALSE -TRUE,FALSE +TRUE,FALSE,4,1 TRUE,FALSE FALSE,TRUE,TRUE,TRUE,TRUE TRUE +FALSE,TRUE,TRUE diff --git a/sc/qa/unit/data/contentCSV/mathematical-functions.csv b/sc/qa/unit/data/contentCSV/mathematical-functions.csv index 639bc2eb6adc..a3577dd1506f 100644 --- a/sc/qa/unit/data/contentCSV/mathematical-functions.csv +++ b/sc/qa/unit/data/contentCSV/mathematical-functions.csv @@ -17,4 +17,60 @@ 5 "1.2","1","0","1000" 2,4,Err:502 - +7.2672834168,195.583 +-12 +-12,-12,-10 +1,-1 +15,1.5 +0.8509181282 +1 +1.4142135624,2 +1.4142135624,2 +5 +1.5222612189 +0,1.5707963268,30 +-5.1929877137,4 +0.7853981634,45 +0.7853981634,45 +0 +1 +1,1 +2.5066282746 +1.3130352855 +180 +2.7182818285 +6,1 +5,-2 +4,2,0,-2 +8,2 +5,5 +TRUE,FALSE,TRUE,TRUE,FALSE +TRUE,FALSE,TRUE,TRUE +128000 +75 +3 +6 +1.23,-1.234 +1.0986122887,321 +2.0959032743,4 +0.6989700043 +-10 +-10 +-10,-10,-12 +84 +64 +24 +24,120,1.4024,6,#DIV/0! +14,24,33,66 +1,1.25,3 +3,4 +1.5707963268,1.308996939 +1.23,45,-45,900,1.2 +2,2,5,3,5,3,1 +1.41,1.3,46,-46,1000 +0 +8,48.3,5.25 +-20,5.25,48,48,18,210,72,14 +1,1 +0 +7.27,195.58 diff --git a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv index b8ba29823d7d..8b8caa53fff4 100644 --- a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv +++ b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv @@ -2,4 +2,18 @@ $C$2,$A$1,Sheet.B$2,Sheet!R2C2 2,4,4,5,6,15,15,6,9 1,3,4,4,2,2 2,4,7,8,4 -4,5,#N/A,8 +4,5,#N/A,8,1 +24,4,4,4,4,3,4,4,0,12,9,9 +3,3,3,2,3,test +1,3,1,1,1,0 +4,1,2 +32767,502,#N/A +Hyperlink,http://www.example.org +3,1 +1,3,5 +bb,bb,zz +4,Today +yy,test,PLUM,VAN +4,55 +7,3 +2,7 diff --git a/sc/qa/unit/data/contentCSV/statistical-functions.csv b/sc/qa/unit/data/contentCSV/statistical-functions.csv index e4e95749926e..2e3c45cdb4a3 100644 --- a/sc/qa/unit/data/contentCSV/statistical-functions.csv +++ b/sc/qa/unit/data/contentCSV/statistical-functions.csv @@ -1 +1,154 @@ 1,1,2,0,3,3 +0.3676796136,0.3676796136 +6.1730730529,6.1730730529 +0.7768698399 +0.7768698399 +4,6,14 +3,6,14,4 +0.0209708029,0.0209708029 +3.2830202868, +11.0704976935,13.388222599 +0.4549364231 +0.0209757694 +0.1115650801,0.7768698399 +0.0002098623,0.5276334473 +11.0704976935 +0.0209708029 +0.0209757694 +7 +0.1938476563,0.1208496094 +0.1938476563,0.1208496094 +0.3501633938 +0.3501633938 +0.6854705811,1.4837646484 +0.9624023438 +0.2907100492 +0 +0 +5.1 +0.8090909091,1 +0.8090909091 +37.6363636364 +41.7937736351 +0.0753454347,0.0149568299 +0 +0 +1.6094379124 +1.6094379124 +0.8646647168 +0.8646647168 +0.3472657011 +0.4621171573 +0.5493061443 +0.9319331609 +0.081755009 +0.9319331609 +0.6143396437 +0.7095282499,0.3856603563 +0.6143396437 +2 +0.1930408167 +0.0106510993 +0.0106510993 +0.1930408167 +8 +0.1735008392 +-29 +-24.8571428571 +-32.25 +-0.6063659074 +0.2976325427 +0.2939945977 +0.2939945977 +4 +4 +4 +0.9278398202 +0.9278398202 +0.0317396518,0.0317396518,0.3989422804 +0.667 +0.625 +0.667 +1.6 +1.1 +1.9 +-0.6063659074 +69.4077578277 +69.4077578277 +0.0299454931,0.9192433408 +0.0299454931,0.9192433408 +0.25,0.75 +0.25 +6 +6 +6 +0,1 +1 +9,7 +200,14 +200,14 +3.8000923613 +3.8000923613 +1.7416698335 +0.8646647168 +0.8646647168 +6.09 +6.09 +6.7666666667 +6.09 +6.7666666667 +6.7666666667 +0.4557955617 +1.9431802805 +0.4557955617 +1.221255395 +-1.4397557473 +0.1704465662 +0.3408931323 +0.8295534338 +3.54474625858076E-005 +2.708305094 +2.4677925359 +2.4677925359 +2.6012817354 +2.4677925359 +2.6012817354 +2.6012817354 +1 +-0.1225598712 +-0.1363480926 +2 +9 +2 +0.5,0.1 +121,216 +120 +1.333334673 +0.8413447461 +1.333334673 +0.2419707245,0.8413447461 +0.0450794929 +60.9 +0 +100 +0 +0 +0 +0 +0 +1 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0.927295218 +3 +13 +15,48,1 +10.1387001854,6.2137119224 +0 diff --git a/sc/qa/unit/data/contentCSV/text-functions.csv b/sc/qa/unit/data/contentCSV/text-functions.csv index 7d68f02c4467..8b0ebeed8b7c 100644 --- a/sc/qa/unit/data/contentCSV/text-functions.csv +++ b/sc/qa/unit/data/contentCSV/text-functions.csv @@ -36,3 +36,6 @@ hello world 169 MAYBE 4321 +un +ff +out diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods Binary files differindex 7f0d2ec47ceb..88cb45b57621 100644 --- a/sc/qa/unit/data/ods/functions.ods +++ b/sc/qa/unit/data/ods/functions.ods diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 2c5a59710f4a..ba625bea07a1 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1492,7 +1492,7 @@ public: if (nEndRow < nLastRow) { - assert(nEndRow > nFirstRow); + assert(nEndRow >= nFirstRow); mnHighIndex = nEndRow - nFirstRow; maBlockMap.insert(BlockMapType::value_type(aLoPos.first->size, aLoPos.first)); |