diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-09 19:32:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-09 22:38:50 +0100 |
| commit | a58c0d4cefe4de132af32d910ec797a2efb3ee3a (patch) | |
| tree | 184accf354eb592ebba452567a0e80d1c0351f1a /sc | |
| parent | cf3dda7c1c1da50db75d4c022bef279149d26636 (diff) | |
cid#1556778 COPY_INSTEAD_OF_MOVE
and
cid#1546474 COPY_INSTEAD_OF_MOVE
cid#1546473 COPY_INSTEAD_OF_MOVE
cid#1546469 COPY_INSTEAD_OF_MOVE
cid#1546467 COPY_INSTEAD_OF_MOVE
cid#1546458 COPY_INSTEAD_OF_MOVE
cid#1546448 COPY_INSTEAD_OF_MOVE
cid#1546446 COPY_INSTEAD_OF_MOVE
cid#1546441 COPY_INSTEAD_OF_MOVE
cid#1546424 COPY_INSTEAD_OF_MOVE
cid#1546377 COPY_INSTEAD_OF_MOVE
cid#1546374 COPY_INSTEAD_OF_MOVE
cid#1546352 COPY_INSTEAD_OF_MOVE
cid#1546334 COPY_INSTEAD_OF_MOVE
cid#1546328 COPY_INSTEAD_OF_MOVE
cid#1546310 COPY_INSTEAD_OF_MOVE
cid#1546303 COPY_INSTEAD_OF_MOVE
Change-Id: I8a43fdd574857ba1d3ec416f23c8269a9a08e12f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160515
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/scmatrix.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 8eb4ae7fde76..72388f14bb03 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -413,7 +413,7 @@ public: /** Apply binary operation to values from two input matrices, storing result into this matrix. */ void ExecuteBinaryOp(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrix& rInputMat1, const ScMatrix& rInputMat2, - ScInterpreter* pInterpreter, CalculateOpFunction op); + ScInterpreter* pInterpreter, const CalculateOpFunction& op); #if DEBUG_MATRIX void Dump() const; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index ae499ec492d1..f091e7264a2c 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1151,7 +1151,7 @@ static SCSIZE lcl_GetMinExtent( SCSIZE n1, SCSIZE n2 ) } static ScMatrixRef lcl_MatrixCalculation( - const ScMatrix& rMat1, const ScMatrix& rMat2, ScInterpreter* pInterpreter, ScMatrix::CalculateOpFunction Op) + const ScMatrix& rMat1, const ScMatrix& rMat2, ScInterpreter* pInterpreter, const ScMatrix::CalculateOpFunction& Op) { SCSIZE nC1, nC2, nMinC; SCSIZE nR1, nR2, nMinR; diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index f62990b76b18..4f351b06b510 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -340,7 +340,7 @@ public: SvNumberFormatter& rFormatter, svl::SharedStringPool& rPool); void ExecuteBinaryOp(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrix& rInputMat1, const ScMatrix& rInputMat2, - ScInterpreter* pInterpreter, ScMatrix::CalculateOpFunction op); + ScInterpreter* pInterpreter, const ScMatrix::CalculateOpFunction& op); bool IsValueOrEmpty( const MatrixImplType::const_position_type & rPos ) const; double GetDouble( const MatrixImplType::const_position_type & rPos) const; FormulaError GetErrorIfNotString( const MatrixImplType::const_position_type & rPos ) const; @@ -2890,7 +2890,7 @@ bool ScMatrixImpl::IsStringOrEmpty(const MatrixImplType::const_position_type & r } void ScMatrixImpl::ExecuteBinaryOp(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrix& rInputMat1, const ScMatrix& rInputMat2, - ScInterpreter* pInterpreter, ScMatrix::CalculateOpFunction Op) + ScInterpreter* pInterpreter, const ScMatrix::CalculateOpFunction& Op) { // Check output matrix size, otherwise output iterator logic will be wrong. assert(maMat.size().row == nMaxRow && maMat.size().column == nMaxCol @@ -3638,7 +3638,7 @@ void ScMatrix::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, } void ScMatrix::ExecuteBinaryOp(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrix& rInputMat1, const ScMatrix& rInputMat2, - ScInterpreter* pInterpreter, CalculateOpFunction op) + ScInterpreter* pInterpreter, const CalculateOpFunction& op) { pImpl->ExecuteBinaryOp(nMaxCol, nMaxRow, rInputMat1, rInputMat2, pInterpreter, op); } |