formula/source/core/api/FormulaCompiler.cxx | 3 +-- include/formula/compiler.hxx | 4 ++-- include/formula/opcode.hxx | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)
New commits: commit 14729a8aadd41f4acd47046c2ed5b58a99c473c2 Author: Eike Rathke <er...@redhat.com> AuthorDate: Fri Sep 28 11:00:27 2018 +0200 Commit: Eike Rathke <er...@redhat.com> CommitDate: Fri Sep 28 15:20:34 2018 +0200 Remove unused ocIndirectXL and ocAddressXL Separated implementation is gone since long. Change-Id: I78279f631c9205202af92ad8e248f9a1226b7a19 Reviewed-on: https://gerrit.libreoffice.org/61075 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Jenkins diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c2a9466ebbb7..59b36b2d3914 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -988,11 +988,10 @@ bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp ) case ocFormula: case ocInfo: // more than one parameters: - // ocIndirect/ocIndirectXL otherwise would have to do + // ocIndirect otherwise would have to do // StopListening and StartListening on a reference for every // interpreted value. case ocIndirect: - case ocIndirectXL: // ocOffset results in indirect references. case ocOffset: // ocDebugVar shows internal value that may change as the internal state changes. diff --git a/include/formula/compiler.hxx b/include/formula/compiler.hxx index 61b054c0d7cc..0d5b1cc8f632 100644 --- a/include/formula/compiler.hxx +++ b/include/formula/compiler.hxx @@ -396,8 +396,8 @@ #define SC_OPCODE_CELL 385 #define SC_OPCODE_ISPMT 386 #define SC_OPCODE_HYPERLINK 387 -#define SC_OPCODE_INDIRECT_XL 388 /* See also INDIRECT for OOO variant */ -#define SC_OPCODE_ADDRESS_XL 389 /* See also ADDRESS for OOO variant */ +// free: 388 +// free: 389 #define SC_OPCODE_GET_PIVOT_DATA 390 #define SC_OPCODE_EUROCONVERT 391 #define SC_OPCODE_NUMBERVALUE 392 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index acc52552c00d..437403d919b2 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -303,9 +303,7 @@ enum OpCode : sal_uInt16 ocDBVarP = SC_OPCODE_DB_VAR_P, // Management functions ocIndirect = SC_OPCODE_INDIRECT, - ocIndirectXL = SC_OPCODE_INDIRECT_XL, ocAddress = SC_OPCODE_ADDRESS, - ocAddressXL = SC_OPCODE_ADDRESS_XL, ocMatch = SC_OPCODE_MATCH, ocCountEmptyCells = SC_OPCODE_COUNT_EMPTY_CELLS, ocCountIf = SC_OPCODE_COUNT_IF, @@ -782,9 +780,7 @@ inline std::string OpCodeEnumToString(OpCode eCode) case ocDBVar: return "DBVar"; case ocDBVarP: return "DBVarP"; case ocIndirect: return "Indirect"; - case ocIndirectXL: return "IndirectXL"; case ocAddress: return "Address"; - case ocAddressXL: return "AddressXL"; case ocMatch: return "Match"; case ocCountEmptyCells: return "CountEmptyCells"; case ocCountIf: return "CountIf"; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits