diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-08-25 21:41:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-08-25 21:42:14 +0300 |
| commit | 162264450cb62177ea133829d081fecdb02136b5 (patch) | |
| tree | 4539df3a17afe2843be63425f4ab2be91eafc587 | |
| parent | 74bc7cb59c1bc3f7acdb4d1492fe563ebcefee6c (diff) | |
Don't claim we support strings arguments in the OpenCL VLOOKUP
The string support certainly isn't complete or correct
anyway. Partially revert c3383aafa18ef9d03b04b2a4719e71fdfabc14eb.
Change-Id: Ica86f39daf864a1a62d92f8d8300d75d020c0ee0
| -rw-r--r-- | sc/source/core/opencl/op_spreadsheet.cxx | 45 | ||||
| -rw-r--r-- | sc/source/core/opencl/op_spreadsheet.hxx | 1 |
2 files changed, 6 insertions, 40 deletions
diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx index d6853c4b20b3..c18b2ba87a52 100644 --- a/sc/source/core/opencl/op_spreadsheet.cxx +++ b/sc/source/core/opencl/op_spreadsheet.cxx @@ -162,28 +162,9 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << " == "; ss << j+1; ss << ")\n"; - if (!(vSubArguments[1+j]->IsMixedArgument())) - { - ss << " {\n"; - ss << " tmp = "; - vSubArguments[1+j]->GenDeclRef(ss); - ss << "[rowNum];\n"; - ss << " }\n"; - - } - else - { - ss << " {\n"; - ss << " tmp = !isNan("; - vSubArguments[1+j]->GenNumDeclRef(ss); - ss << "[rowNum])?"; - vSubArguments[1+j]->GenNumDeclRef(ss); - ss << "[rowNum]:"; - vSubArguments[1+j]->GenStringDeclRef(ss); - ss << "[rowNum];\n"; - ss << " }\n"; - - } + ss << " tmp = "; + vSubArguments[1+j]->GenDeclRef(ss); + ss << "[rowNum];\n"; } ss << " return tmp;\n"; ss << " }\n"; @@ -250,23 +231,9 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << " == "; ss << j+1; ss << ")\n"; - ///Add MixedArguments for string support in Vlookup. - if (!(vSubArguments[1+j]->IsMixedArgument())) - { - ss << " tmp = "; - vSubArguments[1+j]->GenDeclRef(ss); - ss << "[rowNum];\n"; - } - else - { - ss << " tmp = !isNan("; - vSubArguments[1+j]->GenNumDeclRef(ss); - ss << "[rowNum])?"; - vSubArguments[1+j]->GenNumDeclRef(ss); - ss << "[rowNum]:"; - vSubArguments[1+j]->GenStringDeclRef(ss); - ss << "[rowNum];\n"; - } + ss << " tmp = "; + vSubArguments[1+j]->GenDeclRef(ss); + ss << "[rowNum];\n"; } ss << " return tmp;\n"; ss << " }\n"; diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index e787bda0a4cd..190ab1dca135 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -20,7 +20,6 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual std::string BinFuncName() const SAL_OVERRIDE { return "VLookup"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } }; }} |