mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:moveparam in formula

Browse Source 
Change-Id: I358f5e8031c235be76bb96591bf33f59a39b00ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123350
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-10-10 20:36:27 +02:00
parent ea014c324a
commit 6a3cb15452
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
formula/source/core/api/vectortoken.cxx
View File

@@ -64,10 +64,10 @@ size_t SingleVectorRefToken::GetArrayLength() const
}
DoubleVectorRefToken::DoubleVectorRefToken(
const std::vector<VectorRefArray>& rArrays, size_t nArrayLength,
std::vector<VectorRefArray>&& rArrays, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) :
FormulaToken(svDoubleVectorRef, ocPush),
maArrays(rArrays), mnArrayLength(nArrayLength),
maArrays(std::move(rArrays)), mnArrayLength(nArrayLength),
mnRefRowSize(nRefRowSize), mbStartFixed(bStartFixed), mbEndFixed(bEndFixed)
{
SAL_INFO("formula.core", "Created DoubleVectorRefToken nArrayLength=" << nArrayLength);
@@ -76,7 +76,7 @@ DoubleVectorRefToken::DoubleVectorRefToken(
FormulaToken* DoubleVectorRefToken::Clone() const
{
return new DoubleVectorRefToken(
maArrays, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
std::vector(maArrays), mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
}
const std::vector<VectorRefArray>& DoubleVectorRefToken::GetArrays() const

2
include/formula/vectortoken.hxx
View File

@@ -91,7 +91,7 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken final : public FormulaToken
public:
DoubleVectorRefToken(
const std::vector<VectorRefArray>& rArrays, size_t nArrayLength,
std::vector<VectorRefArray>&& rArrays, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed );
virtual FormulaToken* Clone() const override;

3
sc/source/core/data/grouptokenconverter.cxx
View File

@@ -257,7 +257,8 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& rCode, sc::FormulaLogge
aArrays.push_back(aArray);
}
formula::DoubleVectorRefToken aTok(aArrays, nArrayLength, nRefRowSize, bAbsFirst, bAbsLast);
std::vector<formula::VectorRefArray> aArraysTmp = aArrays;
formula::DoubleVectorRefToken aTok( std::move(aArraysTmp), nArrayLength, nRefRowSize, bAbsFirst, bAbsLast );
mrGroupTokens.AddToken(aTok);
rScope.addRefMessage(mrPos, aAbs.aStart, nRequestedLength, aArrays);