diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 10:51:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 10:09:58 +0000 |
| commit | 65227e9a405a61660d61871440727bbad70b5750 (patch) | |
| tree | 5ffa0f0e76583f0853ea33c9db0c77a89db23175 | |
| parent | 06f0d2d9f1ff0f6a8d1eddc693e4c4f65ec2b046 (diff) | |
remove unused svSubroutine from StackVarEnum
Change-Id: I88603ce20dd152b600b2f30c81f091795b23169d
Reviewed-on: https://gerrit.libreoffice.org/34359
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/formula/token.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 2405b66b2e4e..9ba7728c09fa 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -74,7 +74,6 @@ enum StackVarEnum svExternalName, svSingleVectorRef, svDoubleVectorRef, - svSubroutine, // A token with a subroutine token array. svError, // error token svMissing = 0x70, // 0 or "" svSep, // separator, ocSep, ocOpen, ocClose diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index b8ce3466ef85..bf91fcd995c1 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -121,7 +121,6 @@ std::string StackVarEnumToString(StackVar const e) case svExternalName: return "ExternalName"; case svSingleVectorRef: return "SingleVectorRef"; case svDoubleVectorRef: return "DoubleVectorRef"; - case svSubroutine: return "Subroutine"; case svError: return "Error"; case svMissing: return "Missing"; case svSep: return "Sep"; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 05e89da3e4d9..36407d21b1e4 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4400,8 +4400,7 @@ StackVar ScInterpreter::Interpret() // If the function pushed a subroutine as result, continue with // execution of the subroutine. - if (sp > nStackBase && pStack[sp-1]->GetOpCode() == ocCall - /* && pStack[sp-1]->GetType() == svSubroutine */) + if (sp > nStackBase && pStack[sp-1]->GetOpCode() == ocCall) { Pop(); continue; } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index dcbde7029979..ae5cc3b5a8ab 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1570,7 +1570,6 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case svMissing: case svRefList: case svSep: - case svSubroutine: case svUnknown: // We don't support vectorization on these. SAL_INFO("sc.opencl", "opcode ocPush: variable type disables vectorisation for formula group"); |