ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ocCall is dead

Browse Source 
since
  commit 2c8fe2e737
  Author: Noel Grandin <noel@peralex.com>
  Date:   Mon May 16 10:11:04 2016 +0200
  update unusedmethods plugin to deal with constructors

Change-Id: I1730eafc44516bfcf4095d08c93616ec16fa58f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201492
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2026-03-12 06:43:36 +01:00
parent cecee0d122
commit 9cf8591e35
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
formula/source/core/api/FormulaCompiler.cxx
+1 -1
View File
@@ -518,7 +518,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
OpCode eOp;
} aMap[] = {
{ FormulaMapGroupSpecialOffset::PUSH , ocPush } ,
{ FormulaMapGroupSpecialOffset::CALL , ocCall } ,
{ FormulaMapGroupSpecialOffset::CALL , ocNone } , // unused/dead
{ FormulaMapGroupSpecialOffset::STOP , ocStop } ,
{ FormulaMapGroupSpecialOffset::EXTERNAL , ocExternal } ,
{ FormulaMapGroupSpecialOffset::NAME , ocName } ,
include/formula/compiler.hxx
+1 -1
View File
@@ -23,7 +23,7 @@
/*** Special commands ***/
#define SC_OPCODE_PUSH 0 /* internal commands */
#define SC_OPCODE_CALL 1
// used to be SC_OPCODE_CALL
#define SC_OPCODE_STOP 2
#define SC_OPCODE_EXTERNAL 3
#define SC_OPCODE_NAME 4
include/formula/opcode.hxx
-2
View File
@@ -28,7 +28,6 @@ enum OpCode : sal_uInt16
{
// Special commands
ocPush = SC_OPCODE_PUSH,
ocCall = SC_OPCODE_CALL,
ocStop = SC_OPCODE_STOP,
ocExternal = SC_OPCODE_EXTERNAL,
ocName = SC_OPCODE_NAME,
@@ -548,7 +547,6 @@ inline std::string OpCodeEnumToString(OpCode eCode)
switch (eCode)
{
case ocPush: return "Push";
case ocCall: return "Call";
case ocStop: return "Stop";
case ocExternal: return "External";
case ocName: return "Name";
sc/source/core/tool/interpr4.cxx
-7
View File
@@ -4524,13 +4524,6 @@ StackVar ScInterpreter::Interpret()
default : PushError( FormulaError::UnknownOpCode); break;
}
// If the function pushed a subroutine as result, continue with
// execution of the subroutine.
if (sp > nStackBase && pStack[sp-1]->GetOpCode() == ocCall)
{
Pop(); continue;
}
if (FormulaCompiler::IsOpCodeVolatile(eOp))
meVolatileType = VOLATILE;