diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-10 11:49:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-10 16:26:43 +0200 |
| commit | 5c56ee765c570b31b0820ea1a228a0166b84843a (patch) | |
| tree | ee7cb8ca5ccd0861c0d74b2e37d6b326b53bc15f /framework/source/fwe | |
| parent | 9614c3c97bdc544e358ac9979b5a1f2681cfa8d6 (diff) | |
loplugin:unnecessaryreturn AddonsOptions_Impl
Change-Id: Ic2adf9467af7118e8efbbae2132912f3cc3d6943
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116988
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/fwe')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index c67f3b65a06d..ba3693404d93 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -291,9 +291,9 @@ class AddonsOptions_Impl : public ConfigItem void ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& rContainer ); void ReadMergeMenuData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ); - bool ReadMergeToolbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ); - bool ReadMergeNotebookBarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeNotebookBarItems ); - bool ReadMergeStatusbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar ); + void ReadMergeToolbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ); + void ReadMergeNotebookBarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeNotebookBarItems ); + void ReadMergeStatusbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar ); bool ReadMenuItem( std::u16string_view aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu = false ); bool ReadPopupMenu( std::u16string_view aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); void AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ); @@ -1065,12 +1065,12 @@ void AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction } } -bool AddonsOptions_Impl::ReadMergeToolbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) +void AddonsOptions_Impl::ReadMergeToolbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) { OUString aMergeToolbarBaseNode = aMergeAddonInstructionBase + m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ]; - return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems ); + ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems ); } void AddonsOptions_Impl::ReadNotebookBarMergeInstructions( @@ -1138,14 +1138,14 @@ void AddonsOptions_Impl::ReadNotebookBarMergeInstructions( } } -bool AddonsOptions_Impl::ReadMergeNotebookBarData( +void AddonsOptions_Impl::ReadMergeNotebookBarData( std::u16string_view aMergeAddonInstructionBase, Sequence<Sequence<PropertyValue>>& rMergeNotebookBarItems) { OUString aMergeNotebookBarBaseNode = aMergeAddonInstructionBase + m_aPropMergeNotebookBarNames[OFFSET_MERGENOTEBOOKBAR_NOTEBOOKBARITEMS]; - return ReadNotebookBarItemSet(aMergeNotebookBarBaseNode, rMergeNotebookBarItems); + ReadNotebookBarItemSet(aMergeNotebookBarBaseNode, rMergeNotebookBarItems); } void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer ) @@ -1204,12 +1204,10 @@ void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi } } -bool AddonsOptions_Impl::ReadMergeStatusbarData( +void AddonsOptions_Impl::ReadMergeStatusbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbarItems ) { - sal_uInt32 nStatusbarItemCount = rMergeStatusbarItems.getLength(); - OUString aMergeStatusbarBaseNode = aMergeAddonInstructionBase + m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ]; @@ -1238,8 +1236,6 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData( rMergeStatusbarItems[nAddonCount] = aStatusbarItem; } } - - return ( o3tl::make_unsigned(rMergeStatusbarItems.getLength()) > nStatusbarItemCount ); } bool AddonsOptions_Impl::ReadStatusBarItem( |