diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-06 09:58:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-06 11:49:25 +0200 |
| commit | 731ddce00fc704a1415f030f3accce99d3909e2d (patch) | |
| tree | d1c38429ce8c5d05e48277d25a8feef6e133bfba | |
| parent | 959a9947ccdd553ddc59bc9e4ed003212878c1a2 (diff) | |
Fix non-dbgutil build where OpCode is sal_uInt16 and not OpCodeEnum
Change-Id: Ie88b0b23b7b6f688f920f5aadcf711ba15602686
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 529f86d741f1..47499d012c32 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -190,7 +190,7 @@ std::set<OpCodeEnum> SC_DLLPUBLIC ScStringToOpCodeSet(const OUString& rOpCodes) { auto opcode(pHashMap->find(element)); if (opcode != pHashMap->end()) - result.insert(opcode->second); + result.insert(static_cast<OpCodeEnum>(opcode->second)); else SAL_WARN("sc.opencl", "Unrecognized OpCode " << element << " in OpCode set string"); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 93b3778b1f3f..9d86b3e4f36f 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1219,7 +1219,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) if (SC_OPCODE_START_FUNCTION <= eOp && eOp < SC_OPCODE_STOP_FUNCTION) { - if (ScInterpreter::GetGlobalConfig().mbOpenCLSubsetOnly && ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.find(eOp) == ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.end()) + if (ScInterpreter::GetGlobalConfig().mbOpenCLSubsetOnly && ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.find(static_cast<OpCodeEnum>(eOp)) == ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.end()) { meVectorState = FormulaVectorDisabled; return; @@ -1460,7 +1460,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) if (eOp >= SC_OPCODE_START_BIN_OP && eOp <= SC_OPCODE_STOP_UN_OP && ScInterpreter::GetGlobalConfig().mbOpenCLSubsetOnly && - ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.find(eOp) == ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.end()) + ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.find(static_cast<OpCodeEnum>(eOp)) == ScInterpreter::GetGlobalConfig().maOpenCLSubsetOpCodes.end()) { meVectorState = FormulaVectorDisabled; return; |