diff options
| -rw-r--r-- | include/vcl/menu.hxx | 4 | ||||
| -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 |
4 files changed, 0 insertions, 13 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6ca076fc1473..d6d98377a13c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -140,8 +140,6 @@ private: sal_uInt16 nDefaultItem; // Id of default item sal_uInt16 nSelectedId; - sal_uInt16 nHighlightedItem; - // for output: sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; @@ -256,8 +254,6 @@ public: sal_uInt16 GetCurItemId() const { return nSelectedId;} OString GetCurItemIdent() const; - void SetHighlightItem(sal_uInt16 nHighlightedItem); - void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } sal_uInt16 GetDefaultItem() const { return nDefaultItem; } 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 |