diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 11:16:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 11:17:25 +0100 |
commit | 2162041fabaf8b65ac1e5ed04909a15678a2f57b (patch) | |
tree | 28c9846848228c930e1766154aac4b631ec2db11 /vcl | |
parent | 11311b9216b61c7c7baa1d223726520fe2ad2264 (diff) |
nHighlightedItem only ever set, never read
Change-Id: Ie4b1517e41e09df3c243b6d4ff124f50777e8bc0
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/menu.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 236929a5d82b..88092318e530 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -722,12 +722,6 @@ MenuItemType Menu::GetItemType( sal_uInt16 nPos ) const return MENUITEM_DONTKNOW; } -void Menu::SetHighlightItem( sal_uInt16 nItem ) -{ - nHighlightedItem = nItem; -} - - OString Menu::GetCurItemIdent() const { const MenuItemData* pData = pItemList->GetData(nSelectedId); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 2a82c613776d..c9770ca813f5 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -508,7 +508,6 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b HighlightItem( nHighlightedItem, true ); else if ( nRolloveredItem != ITEMPOS_INVALID ) HighlightItem( nRolloveredItem, true ); - pMenu->SetHighlightItem(nHighlightedItem); pMenu->ImplCallHighlight(nHighlightedItem); if( mbAutoPopup ) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index a1754b0a8d4e..ad53c97a66f6 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -67,7 +67,6 @@ void MenuFloatingWindow::doShutdown() // otherwise the entry will not be read when the menu is opened again if( nHighlightedItem != ITEMPOS_INVALID ) pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); - pMenu->SetHighlightItem(ITEMPOS_INVALID); if (!bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->IsMenuBar()) { // #102461# remove highlight in parent @@ -692,7 +691,6 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTime } } HighlightItem( nHighlightedItem, true ); - pMenu->SetHighlightItem(nHighlightedItem); pMenu->ImplCallHighlight( nHighlightedItem ); } else |