diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-08-25 15:11:54 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-18 10:09:45 +0200 |
| commit | 4d61abf91ea365d2ed2a58a5a029ee0689386dcf (patch) | |
| tree | 9edb0da92ede1a8f1a0ca5b80762e93ba591c9e2 /officecfg/registry | |
| parent | 1ce4906e5a5265cf89e06dd674527b16c99a789d (diff) | |
Fix the OpenCL VLOOKUP to work properly and add it to the trusted subset
Treat an array of null string pointers as no strings for OpenCL. For
some reason, at least in the case of the "Test OpenCL" thing, we got
an mpStringArray that is non-null but where all the elements
(rtl_uString pointers) in it are null. Treat that case as if the
mpStringArray was null.
This makes the tests "Test OpenCL" actually use OpenCL. Maybe it has other
useful effects, too. (But for normal spreadsheet use, the mpStringArray that
gets handled here *is* null when all the cells used by a formula group are
numbers. At least it seemed so in a simple test.)
Add a few more useful (?) SAL_INFO calls.
Some cosmetic changes to make the code look saner.
Return correct value from the OpenCL VLOOKUP implementation. Also,
when the lookup fails, produce the expected N/A error code instead of
a bare NaN.
Don't claim we support strings arguments in the OpenCL VLOOKUP. The
string support certainly isn't complete or correct anyway. Partially
revert c3383aafa18ef9d03b04b2a4719e71fdfabc14eb.
Add VLOOKUP to the set of opcodes that we trust the OpenCL
implementation for.
(cherry picked from commit 7e91726f4d81f0ab27d79ee231abd666b4999758)
(cherry picked from commit d4310b6cd8a367666cc702c3e47cf12a35407ef7)
(cherry picked from commit 32b35d9d8a21091b987d94fc2ad24d69e9d8a6f3)
(cherry picked from commit 41a6094095a0cd42f24eb996c7ec8c28ab9d6c1a)
(cherry picked from commit 162264450cb62177ea133829d081fecdb02136b5)
(cherry picked from commit 7bb7539c0e34283baeaacf7e4ff0b19287afadc2)
Change-Id: I5402732c9ddcac1efcc25960a5c46175d7a90b4d
Reviewed-on: https://gerrit.libreoffice.org/18022
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'officecfg/registry')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index bb74d74b6256..c3fa5239a712 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1373,7 +1373,7 @@ true, and a formula contains only these operators and functions, it might be calculated using OpenCL.</desc> </info> - <value>+;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSDIST;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;VAR;NORMDIST;CORREL;COVAR;PEARSON;SLOPE;SUMIFS</value> + <value>+;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSDIST;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;VAR;NORMDIST;VLOOKUP;CORREL;COVAR;PEARSON;SLOPE;SUMIFS</value> </prop> <prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Formula --> |