diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-01 15:08:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-02 10:30:49 +0200 |
| commit | 7c610a2a74ca2bde7673b3ceee11c1b3f6b9d498 (patch) | |
| tree | ef333efac79c7e2eea2de1542488ee2565a506bf /framework | |
| parent | 7de66670069219c3507734aefc2d600a3bef2071 (diff) | |
loplugin:constantparam
Change-Id: I9fbfa6163c1d4650c52b00dc911972f07fe7c0e5
Reviewed-on: https://gerrit.libreoffice.org/56778
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/statusbarmerger.hxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmerger.cxx | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 5d752d1d4f8b..0d676b86b35c 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -44,8 +44,7 @@ typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer; namespace StatusbarMerger { - bool IsCorrectContext( const ::rtl::OUString& aContext, - const ::rtl::OUString& aModuleIdentifier ); + bool IsCorrectContext( const ::rtl::OUString& aContext ); bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence, AddonStatusbarItemContainer& rContainer ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index df5421a58e69..a071889c8f23 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -477,7 +477,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc for ( sal_uInt32 i = 0; i < nCount; i++ ) { MergeStatusbarInstruction &rInstruction = aMergeInstructions[i]; - if ( !StatusbarMerger::IsCorrectContext( rInstruction.aMergeContext, "" ) ) + if ( !StatusbarMerger::IsCorrectContext( rInstruction.aMergeContext ) ) continue; AddonStatusbarItemContainer aItems; diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 7239fb5b20cc..455950458304 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -113,7 +113,7 @@ bool lcl_MergeItems( StatusBar* pStatusbar, for ( sal_Int32 i = 0; i < nSize; i++ ) { const AddonStatusbarItem& rItem = rAddonItems[i]; - if ( !StatusbarMerger::IsCorrectContext( rItem.aContext, OUString() ) ) + if ( !StatusbarMerger::IsCorrectContext( rItem.aContext ) ) continue; sal_uInt16 nInsPos = nPos + nModIndex + i; @@ -155,10 +155,9 @@ bool lcl_RemoveItems( StatusBar* pStatusbar, } bool StatusbarMerger::IsCorrectContext( - const OUString& rContext, - const OUString& rModuleIdentifier ) + const OUString& rContext ) { - return (( rContext.getLength() == 0 ) || ( rContext.indexOf( rModuleIdentifier ) >= 0 )); + return rContext.isEmpty(); } bool StatusbarMerger::ConvertSeqSeqToVector( |