diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-01 13:10:10 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-01 18:06:21 +0200 |
commit | 38bef03742c94376a974f84693ff2e48693e6839 (patch) | |
tree | adeaffac0b7707f4d08463bef12cb024b2a62102 /vcl/source/window/menuitemlist.cxx | |
parent | 75a48e37b260c145297261d0e0ab5720894404f1 (diff) |
pass menuitem ident around directly, instead of deriving from itemid
sidestepping the while duplicate itemids in separate submenus problem
Change-Id: Icb57ac805f3c8c4fc3a68341e318375c6492cbb1
Reviewed-on: https://gerrit.libreoffice.org/61189
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window/menuitemlist.cxx')
-rw-r--r-- | vcl/source/window/menuitemlist.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 7be1f22f917e..9c25bf4e17d1 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -163,17 +163,6 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, size_t& rPos ) const return nullptr; } -MenuItemData* MenuItemList::GetDataFromSubMenu(sal_uInt16 nSVId) const -{ - for ( size_t i = 0, n = maItemList.size(); i < n; ++i ) - { - if ( maItemList[i]->pSubMenu - && maItemList[i]->pSubMenu->GetCurItemId() != 0 ) // if something is selected - return maItemList[i].get()->pSubMenu->GetItemList()->GetDataFromPos(nSVId - 1); - } - return nullptr; -} - MenuItemData* MenuItemList::SearchItem( sal_Unicode cSelectChar, KeyCode aKeyCode, |