diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-01 16:13:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-02 08:03:16 +0200 |
| commit | df6270e9c1d75a4865bf79043190669b74de71d3 (patch) | |
| tree | 6d2affabf04146d5ee997ae0c6d3caadacc76524 /cui | |
| parent | 8f90492812d1edac6c91e83b84f3512877dcd552 (diff) | |
loplugin:returnconstant in cui,desktop
Change-Id: Ieec9e3d9e2e18add9a1bc7e0e15bb8435ea51954
Reviewed-on: https://gerrit.libreoffice.org/58428
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 5 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 29f8641eacef..e7e4565e5d8b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -449,14 +449,14 @@ MenuSaveInData::SetEntries( std::unique_ptr<SvxEntries> pNewEntries ) pRootEntry->SetEntries( std::move(pNewEntries) ); } -bool SaveInData::LoadSubMenus( const uno::Reference< container::XIndexAccess >& xMenuSettings, +void SaveInData::LoadSubMenus( const uno::Reference< container::XIndexAccess >& xMenuSettings, const OUString& rBaseTitle, SvxConfigEntry const * pParentData, bool bContextMenu ) { SvxEntries* pEntries = pParentData->GetEntries(); // Don't access non existing menu configuration! if ( !xMenuSettings.is() ) - return true; + return; for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); ++nIndex ) { @@ -559,7 +559,6 @@ bool SaveInData::LoadSubMenus( const uno::Reference< container::XIndexAccess >& } } } - return true; } bool MenuSaveInData::Apply() diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 5d85a87408b3..00ef79f0f552 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -122,7 +122,7 @@ protected: css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory, SvxConfigEntry *pMenuData ); - bool LoadSubMenus( + void LoadSubMenus( const css::uno::Reference< css::container::XIndexAccess >& xMenuSettings, const OUString& rBaseTitle, SvxConfigEntry const * pParentData, bool bContextMenu ); |