sc/inc/compiler.hxx | 4 ++--
sc/source/core/tool/compiler.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4d263b48a1353804816a55433f2ee90e96be1e32
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 13:32:17 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Nov 9 17:53:14 2023 +0100
loplugin:fieldcast in ScCompiler::TableRefEntry
Change-Id: I5d02daa209b735fbc0dcd10fd45056d586837d05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159211
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index fbf5073743e1..9cff881db62d 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -307,9 +307,9 @@ private:
struct TableRefEntry
{
- ScTokenRef mxToken;
+ boost::intrusive_ptr<ScTableRefToken> mxToken;
sal_uInt16 mnLevel;
- TableRefEntry( formula::FormulaToken* p ) : mxToken(p), mnLevel(0) {}
+ TableRefEntry( ScTableRefToken* p ) : mxToken(p), mnLevel(0) {}
};
std::vector<TableRefEntry> maTableRefs; /// "stack" of currently
active ocTableRef tokens
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2a5491f4666b..63b1f0969225 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3999,7 +3999,7 @@ bool ScCompiler::ParseTableRefItem( const OUString& rName
)
{
// Only called when there actually is a current TableRef, hence
// accessing maTableRefs.back() is safe.
- ScTableRefToken* p =
dynamic_cast<ScTableRefToken*>(maTableRefs.back().mxToken.get());
+ ScTableRefToken* p = maTableRefs.back().mxToken.get();
assert(p); // not a ScTableRefToken can't be
switch ((*iLook).second)
@@ -4067,7 +4067,7 @@ bool ScCompiler::ParseTableRefColumn( const OUString&
rName )
{
// Only called when there actually is a current TableRef, hence
// accessing maTableRefs.back() is safe.
- ScTableRefToken* p =
dynamic_cast<ScTableRefToken*>(maTableRefs.back().mxToken.get());
+ ScTableRefToken* p = maTableRefs.back().mxToken.get();
assert(p); // not a ScTableRefToken can't be
ScDBData* pDBData = rDoc.GetDBCollection()->getNamedDBs().findByIndex(
p->GetIndex());
@@ -4918,7 +4918,7 @@ std::unique_ptr<ScTokenArray> ScCompiler::CompileString(
const OUString& rFormul
const FormulaToken* pPrev = pArr->PeekPrev( nIdx);
if (pPrev && pPrev->GetOpCode() == ocDBArea)
{
- FormulaToken* pTableRefToken = new ScTableRefToken(
pPrev->GetIndex(), ScTableRefToken::TABLE);
+ ScTableRefToken* pTableRefToken = new ScTableRefToken(
pPrev->GetIndex(), ScTableRefToken::TABLE);
maTableRefs.emplace_back( pTableRefToken);
// pPrev may be dead hereafter.
static_cast<ScTokenArray*>(pArr)->ReplaceToken( nIdx,
pTableRefToken,
