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>

1 files changed, 4 insertions, 7 deletions

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 8ffa935e9141..6aa89d937b8b 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -50,7 +50,9 @@ void MenuButton::ExecuteMenu()
     {
         Point aPos(0, 1);
         tools::Rectangle aRect(aPos, aSize );
-        mnCurItemId = mpMenu->Execute(this, aRect, PopupMenuFlags::ExecuteDown);
+        mpMenu->Execute(this, aRect, PopupMenuFlags::ExecuteDown);
+        mnCurItemId = mpMenu->GetCurItemId();
+        msCurItemIdent = mpMenu->GetCurItemIdent();
     }
     else
     {
@@ -70,6 +72,7 @@ void MenuButton::ExecuteMenu()
     {
         Select();
         mnCurItemId = 0;
+        msCurItemIdent.clear();
     }
 }
 
@@ -107,12 +110,6 @@ bool MenuButton::MenuShown() const
     }
 }
 
-OString MenuButton::GetCurItemIdent() const
-{
-    return (mnCurItemId && mpMenu) ?
-        mpMenu->GetItemIdent(mnCurItemId) : OString();
-}
-
 MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits )
     : PushButton(WindowType::MENUBUTTON)
     , mnCurItemId(0)