[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara]

 include/vcl/menu.hxx                     |    4 ----
 vcl/source/window/menu.cxx               |    6 ------
 vcl/source/window/menubarwindow.cxx      |    1 -
 vcl/source/window/menufloatingwindow.cxx |    2 --
 4 files changed, 13 deletions(-)

New commits:
commit 2162041fabaf8b65ac1e5ed04909a15678a2f57b
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Sep 25 11:16:40 2014 +0100

    nHighlightedItem only ever set, never read
    
    Change-Id: Ie4b1517e41e09df3c243b6d4ff124f50777e8bc0

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6ca076f..d6d9837 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 236929a..8809231 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 2a82c61..c9770ca 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 a1754b0..ad53c97 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

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits