From 359e0b47a0f96ffa595a0c38a5e5318d797812fe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 7 Mar 2016 08:09:35 +0200 Subject: loplugin:unuseddefaultparams Change-Id: Ia414f7845425ef73859ed04853378e96cc738795 Reviewed-on: https://gerrit.libreoffice.org/22971 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/core/data/attarray.cxx | 20 ++++++-------------- sc/source/core/data/column.cxx | 4 ++-- sc/source/core/data/compressedarray.cxx | 10 ++++------ sc/source/filter/oox/formulaparser.cxx | 4 ++-- 4 files changed, 14 insertions(+), 24 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index d97b7e2ecb37..816069a5ed74 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1825,7 +1825,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const const SCROW SC_VISATTR_STOP = 84; -bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFullFormattedArea ) const +bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const { OSL_ENSURE( nCount, "nCount == 0" ); @@ -1845,18 +1845,10 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu SCROW nStartRow = (nPos ? pData[nPos-1].nRow + 1 : 0); if (nStartRow <= nLastData + 1) { - if (bFullFormattedArea && pData[nPos].pPattern->IsVisible()) - { - rLastRow = pData[nPos].nRow; - return true; - } - else - { - // Ignore here a few rows if data happens to end within - // SC_VISATTR_STOP rows before MAXROW. - rLastRow = nLastData; - return false; - } + // Ignore here a few rows if data happens to end within + // SC_VISATTR_STOP rows before MAXROW. + rLastRow = nLastData; + return false; } // Find a run below last data row. @@ -1873,7 +1865,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu if ( nAttrStartRow <= nLastData ) nAttrStartRow = nLastData + 1; SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow; - if ( nAttrSize >= SC_VISATTR_STOP && !bFullFormattedArea ) + if ( nAttrSize >= SC_VISATTR_STOP ) break; // while, ignore this range and below else if ( pData[nEndPos].pPattern->IsVisible() ) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 8b2e3a60750e..95d9c342a0f2 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1693,12 +1693,12 @@ void ScColumn::CopyToColumn( void ScColumn::UndoToColumn( sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked, - ScColumn& rColumn, const ScMarkData* pMarkData ) const + ScColumn& rColumn ) const { if (nRow1 > 0) CopyToColumn(rCxt, 0, nRow1-1, InsertDeleteFlags::FORMULA, false, rColumn); - CopyToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData); //TODO: bMarked ???? + CopyToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, rColumn); //TODO: bMarked ???? if (nRow2 < MAXROW) CopyToColumn(rCxt, nRow2+1, MAXROW, InsertDeleteFlags::FORMULA, false, rColumn); diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index 6411fa838d31..d79643da9cb5 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -238,16 +238,15 @@ void ScCompressedArray::SetValue( A nStart, A nEnd, const D& rValue ) template< typename A, typename D > void ScCompressedArray::CopyFrom( const ScCompressedArray& rArray, A nStart, - A nEnd, long nSourceDy ) + A nEnd ) { size_t nIndex = 0; A nRegionEnd; for (A j=nStart; j<=nEnd; ++j) { const D& rValue = (j==nStart ? - rArray.GetValue( j+nSourceDy, nIndex, nRegionEnd) : + rArray.GetValue( j, nIndex, nRegionEnd) : rArray.GetNextValue( nIndex, nRegionEnd)); - nRegionEnd -= nSourceDy; if (nRegionEnd > nEnd) nRegionEnd = nEnd; this->SetValue( j, nRegionEnd, rValue); @@ -370,16 +369,15 @@ void ScBitMaskCompressedArray::OrValue( A nStart, A nEnd, template< typename A, typename D > void ScBitMaskCompressedArray::CopyFromAnded( const ScBitMaskCompressedArray& rArray, A nStart, A nEnd, - const D& rValueToAnd, long nSourceDy ) + const D& rValueToAnd ) { size_t nIndex = 0; A nRegionEnd; for (A j=nStart; j<=nEnd; ++j) { const D& rValue = (j==nStart ? - rArray.GetValue( j+nSourceDy, nIndex, nRegionEnd) : + rArray.GetValue( j, nIndex, nRegionEnd) : rArray.GetNextValue( nIndex, nRegionEnd)); - nRegionEnd -= nSourceDy; if (nRegionEnd > nEnd) nRegionEnd = nEnd; this->SetValue( j, nRegionEnd, rValue & rValueToAnd); diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 975005ce761e..7b899f4fc256 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -478,8 +478,8 @@ protected: template< typename Type > bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); template< typename Type > - inline bool pushValueOperandToken( const Type& rValue, const WhiteSpaceVec* pSpaces = nullptr ) - { return pushValueOperandToken( rValue, OPCODE_PUSH, pSpaces ); } + inline bool pushValueOperandToken( const Type& rValue ) + { return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); } bool pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr ); bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); bool pushUnaryPostOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); -- cgit