diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-08-25 18:33:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-08-25 19:35:29 +0300 |
| commit | 7bb7539c0e34283baeaacf7e4ff0b19287afadc2 (patch) | |
| tree | 0cfb1e447de57e44ea3212d9afefe59ef056f8e9 | |
| parent | 41a6094095a0cd42f24eb996c7ec8c28ab9d6c1a (diff) | |
Add VLOOKUP to the set of opcodes that we trust the OpenCL implementation for
Change-Id: I937ec900044bbc6027ff8d4ae37f2f275dde974f
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 1 |
2 files changed, 2 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 --> diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index cc52ad7b3de7..868ddd1b3e8b 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -67,6 +67,7 @@ void ScCalcConfig::setOpenCLConfigToDefault() maOpenCLSubsetOpCodes.insert(ocCount); maOpenCLSubsetOpCodes.insert(ocVar); maOpenCLSubsetOpCodes.insert(ocNormDist); + maOpenCLSubsetOpCodes.insert(ocVLookup); maOpenCLSubsetOpCodes.insert(ocCorrel); maOpenCLSubsetOpCodes.insert(ocCovar); maOpenCLSubsetOpCodes.insert(ocPearson); |