diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-01 12:54:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-03 09:08:42 +0000 |
| commit | f3c1d240bd4f32d014db00a9864c56f77b7cb127 (patch) | |
| tree | ff952e1002ed98d1a0d537193f7bd15aac64b1c9 /sc | |
| parent | 643b70006fd5f6762561696421808f20d4e1e86f (diff) | |
loplugin:constantparams
Change-Id: Ib162ba9297b9d900ea42c7e5216e152d3e58a361
Reviewed-on: https://gerrit.libreoffice.org/25769
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/attarray.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/attarray.cxx | 5 | ||||
| -rw-r--r-- | sc/source/core/data/column.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xltoolbar.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97esc.cxx | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index afff019bbde6..c1f5c2a70b0d 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -163,7 +163,7 @@ public: void RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const; + bool IsStyleSheetUsed( const ScStyleSheet& rStyle ) const; void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index d22b868f0a22..f122b287aef4 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1752,8 +1752,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo } } -bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, - bool bGatherAllStyles ) const +bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const { bool bIsUsed = false; SCSIZE nPos = 0; @@ -1766,8 +1765,6 @@ bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, pStyle->SetUsage( ScStyleSheet::USED ); if ( pStyle == &rStyle ) { - if ( !bGatherAllStyles ) - return true; bIsUsed = true; } } diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 8b6d1aa0a7ef..548efca6861d 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -665,7 +665,7 @@ void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolR bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const { - return pAttrArray->IsStyleSheetUsed( rStyle, true/*bGatherAllStyles*/ ); + return pAttrArray->IsStyleSheetUsed( rStyle ); } bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, ScMF nFlags ) diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 8d7fc32c63ad..8ac060254513 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -282,7 +282,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere return false; if ( !bIsMenuToolbar ) { - if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ), true ) ) + if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ) ) ) return false; } else diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 0333afb70141..dedab777b74e 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -568,7 +568,7 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM hExpHlink.WriteEmbeddedData( tmpStream ); } if ( !sHyperLink.isEmpty() || !sMacro.isEmpty() ) - rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm, true ) ); + rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm ) ); } catch( Exception& ) { |