loplugin:unusedfields

Change-Id: I3f14647eed72898b641fbd583d18f914c7461628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101630
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 0 insertions, 9 deletions

diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 698b46341579..60baef602fc7 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -183,7 +183,6 @@ class MenuBarManager final :
         bool                                                         m_bAcceleratorCfg;
         bool                                                         m_bModuleIdentified;
         bool                                                         m_bHasMenuBar;
-        OUString                                                     m_aMenuItemCommand;
         OUString                                                     m_aModuleIdentifier;
         VclPtr<Menu>                                                 m_pVCLMenu;
         css::uno::Reference< css::frame::XFrame >                    m_xFrame;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 95ca6cc01458..f89bd8c6a1c3 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -34,7 +34,6 @@ namespace framework
 
 struct AddonsParams
 {
-    OUString aImageId;
     OUString aControlType;
     sal_uInt16 nWidth;
 };
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index eb3fe530acce..cbe4f5ebf64f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1605,8 +1605,6 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sI
     Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
     m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
 
-    // store menu item command as we later have to know which menu is active (see Activate handler)
-    pSubMenuManager->m_aMenuItemCommand = _sItemCommand;
     Reference< XDispatch > xDispatch;
     std::unique_ptr<MenuItemHandler> pMenuItemHandler(new MenuItemHandler(
                                                 _nItemId,
@@ -1659,9 +1657,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame, Menu* pAddonMenu, b
 
             Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
 
-            // store menu item command as we later have to know which menu is active (see Activate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
             std::unique_ptr<MenuItemHandler> pMenuItemHandler(new MenuItemHandler(
                                                         nItemId,
                                                         xSubMenuManager,
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 5dc5c17dca48..b36a24d4784d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1211,7 +1211,6 @@ void ToolBarManager::FillAddonToolbar( const Sequence< Sequence< PropertyValue >
 
                 // Create AddonsParams to hold additional information we will need in the future
                 AddonsParams* pRuntimeItemData = new AddonsParams;
-                pRuntimeItemData->aImageId = aImageId;
                 pRuntimeItemData->aControlType = aControlType;
                 pRuntimeItemData->nWidth = nWidth;
                 m_pToolBar->SetItemData( nId, pRuntimeItemData );
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index c012576fa35b..771fbbe5df01 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -639,7 +639,6 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems
 
     // Use the user data to store add-on specific data with the toolbar item
     AddonsParams* pAddonParams = new AddonsParams;
-    pAddonParams->aImageId     = rItem.aImageIdentifier;
     pAddonParams->aControlType = rItem.aControlType;
     pAddonParams->nWidth       = rItem.nWidth;
     pToolbar->SetItemData( nItemId, pAddonParams );