From b18e1bc61ccba9d0c74274e2fe45b2b422c601cf Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Sep 2016 12:13:42 +0200 Subject: loplugin:unusedfields Change-Id: I852e98b16fdcb88b04e39d11e3101d502c918c24 Reviewed-on: https://gerrit.libreoffice.org/29078 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- framework/source/fwe/classes/addonmenu.cxx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'framework') diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 09176d522fad..ebfcb0a494ae 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -46,8 +46,7 @@ const sal_uInt16 SID_HELPMENU = (SID_SFX_START + 410); namespace framework { -AddonMenu::AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ) : - m_xFrame( rFrame ) +AddonMenu::AddonMenu() { } @@ -62,8 +61,8 @@ bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) return aCmdURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ); } -AddonPopupMenu::AddonPopupMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ) : - AddonMenu( rFrame ) +AddonPopupMenu::AddonPopupMenu() : + AddonMenu() { } @@ -94,12 +93,12 @@ bool AddonMenuManager::HasAddonMenuElements() } // Factory method to create different Add-On menu types -VclPtr AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Reference< XFrame >& rFrame ) +VclPtr AddonMenuManager::CreatePopupMenuType( MenuType eMenuType ) { if ( eMenuType == ADDON_MENU ) - return VclPtr::Create( rFrame ); + return VclPtr::Create(); else if ( eMenuType == ADDON_POPUPMENU ) - return VclPtr::Create( rFrame ); + return VclPtr::Create(); else return nullptr; } @@ -115,7 +114,7 @@ VclPtr AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu(); if ( rAddonMenuEntries.getLength() > 0 ) { - pAddonMenu = static_cast(AddonMenuManager::CreatePopupMenuType( ADDON_MENU, rFrame ).get()); + pAddonMenu = static_cast(AddonMenuManager::CreatePopupMenuType( ADDON_MENU ).get()); ::rtl::OUString aModuleIdentifier = GetModuleIdentifier( rContext, rFrame ); AddonMenuManager::BuildMenu( pAddonMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, rAddonMenuEntries, rFrame, aModuleIdentifier ); @@ -235,7 +234,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, AddonMenuManager::IsCorrectContext( aModuleIdentifier, aContext )) { sal_uInt16 nId = nUniqueMenuId++; - VclPtr pAddonPopupMenu = static_cast(AddonMenuManager::CreatePopupMenuType( ADDON_POPUPMENU, rFrame ).get()); + VclPtr pAddonPopupMenu = static_cast(AddonMenuManager::CreatePopupMenuType( ADDON_POPUPMENU ).get()); AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, aModuleIdentifier ); @@ -291,7 +290,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent VclPtr pSubMenu; if ( aAddonSubMenu.getLength() > 0 ) { - pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType, rFrame ); + pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType ); AddonMenuManager::BuildMenu( pSubMenu, nSubMenuType, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModuleIdentifier ); // Don't create a menu item for an empty sub menu -- cgit ora/libreoffice-4.0.6.2'>distro/collabora/libreoffice-4.0.6.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author