sc/source/core/tool/token.cxx | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 4ed26399e2c9a0d35a1f7e6f19f68a5bb0303109
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Tue Apr 23 13:38:08 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Tue Apr 23 23:00:56 2024 +0200
NFC ScRawToken::CreateToken: ocPush uses the same function
Ever since commit 87307aba9e8dbca16672e6df701d9f905b9e1786
Author: Jens-Heiner Rechtien on Thu Jan 8 10:47:13 2009 +0000
CWS-TOOLING: integrate CWS frmdlg
case svSingleRef :
if (eOp == ocPush)
return new ScSingleRefToken( aRef.Ref1 );
else
- return new ScSingleRefOpToken( eOp, aRef.Ref1 );
+ return new ScSingleRefToken( aRef.Ref1, eOp );
case svDoubleRef :
if (eOp == ocPush)
return new ScDoubleRefToken( aRef );
else
- return new ScDoubleRefOpToken( eOp, aRef );
+ return new ScDoubleRefToken( aRef, eOp );
Instead of using different functions, they now use the same function
where optional eOp = ocPush [sc/inc/token.hxx].
Change-Id: I3ee0f308bd983c3edd54fdd064b957b63ca4c0d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166564
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 33e520723213..364913e4fa99 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -370,15 +370,9 @@ FormulaToken* ScRawToken::CreateToken(ScSheetLimits&
rLimits) const
return new FormulaStringOpToken(eOp, std::move(aSS));
}
case svSingleRef :
- if (eOp == ocPush)
- return new ScSingleRefToken(rLimits, aRef.Ref1 );
- else
- return new ScSingleRefToken(rLimits, aRef.Ref1, eOp );
+ return new ScSingleRefToken(rLimits, aRef.Ref1, eOp);
case svDoubleRef :
- if (eOp == ocPush)
- return new ScDoubleRefToken(rLimits, aRef );
- else
- return new ScDoubleRefToken(rLimits, aRef, eOp );
+ return new ScDoubleRefToken(rLimits, aRef, eOp);
case svMatrix :
IF_NOT_OPCODE_ERROR( ocPush, ScMatrixToken);
return new ScMatrixToken( pMat );
