vcl makes no use of menu Get/Set DefaultItem

this is exposed through uno however, so move it into VCLXMenu to continue to
support it doing nothing of great value there

Change-Id: I6888e61cbec85faa2d1fcca8731ab42023e594c6

7 files changed, 6 insertions, 20 deletions

diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 8a21b548a5ed..133f6999b130 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -329,7 +329,6 @@ String RID_STR_SHAREMACROSDIALOGS
 Menu RID_POPUP_BRKPROPS
 {
     Text [ en-US ] = "Properties" ;
-    DefaultItemId = RID_BRKPROPS ;
     ItemList =
     {
         MenuItem
@@ -367,7 +366,6 @@ Menu RID_POPUP_BRKDLG
 
 Menu RID_POPUP_TABBAR
 {
-    DefaultItemId = SID_BASICIDE_HIDECURPAGE ;
     ItemList =
     {
         MenuItem
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 77dc70911e02..91d088ac492b 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -63,6 +63,7 @@ private:
     VclPtr<Menu>            mpMenu;
     MenuListenerMultiplexer maMenuListeners;
     PopupMenuRefList        maPopupMenuRefs;
+    sal_Int16               mnDefaultItem;
 
 protected:
     ::osl::Mutex&           GetMutex() { return maMutex; }
diff --git a/include/tools/rc.h b/include/tools/rc.h
index aa9f24ab7a9f..c1da806985d2 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -29,10 +29,9 @@
 enum class RscMenu {
     Items                  = 0x01,
     Text                   = 0x02,
-    DefaultItemId          = 0x04
 };
 namespace o3tl {
-    template<> struct typed_flags<RscMenu> : is_typed_flags<RscMenu, 0x07> {};
+    template<> struct typed_flags<RscMenu> : is_typed_flags<RscMenu, 0x03> {};
 }
 
 // "MenuItem" resource options:
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 959d54d9f118..313ae5384f9d 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -150,7 +150,6 @@ private:
     ImplSVEvent* nEventId;
     sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item
     MenuFlags nMenuFlags;
-    sal_uInt16 nDefaultItem;       // Id of default item
     sal_uInt16 nSelectedId;
 
     // for output:
@@ -271,9 +270,6 @@ public:
     sal_uInt16 GetCurItemId() const { return nSelectedId;}
     OString GetCurItemIdent() const;
 
-    void SetDefaultItem( sal_uInt16 nItemId )    { nDefaultItem = nItemId; }
-    sal_uInt16 GetDefaultItem() const              { return nDefaultItem; }
-
     void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits );
     MenuItemBits GetItemBits( sal_uInt16 nItemId ) const;
 
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 9927113a0b67..e03ce1e04422 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -357,9 +357,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
     }
     nId = aNmTb.Put( "Text", VARNAME );
     pClassMenu->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscMenu::Text );
-    nId = aNmTb.Put( "DefaultItemId", VARNAME );
-    pClassMenu->SetVariable( nId, &aIdUShort, nullptr, 0,
-                                 (sal_uInt32)RscMenu::DefaultItemId );
 
     return pClassMenu;
 }
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 2b98cc7436ae..45252bc718e4 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -40,12 +40,14 @@
 
 VCLXMenu::VCLXMenu()
     : maMenuListeners( *this )
+    , mnDefaultItem(0)
 {
     mpMenu = nullptr;
 }
 
 VCLXMenu::VCLXMenu( Menu* pMenu )
     : maMenuListeners( *this )
+    , mnDefaultItem(0)
 {
     mpMenu = pMenu;
 }
@@ -476,20 +478,17 @@ void VCLXMenu::setDefaultItem(
     sal_Int16 nItemId )
 throw(css::uno::RuntimeException, std::exception)
 {
-    SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    if ( mpMenu )
-        mpMenu->SetDefaultItem( nItemId );
+    mnDefaultItem = nItemId;
 }
 
 sal_Int16 VCLXMenu::getDefaultItem(  )
 throw(css::uno::RuntimeException, std::exception)
 {
-    SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    return mpMenu ? mpMenu->GetDefaultItem() : 0;
+    return mnDefaultItem;
 }
 
 void VCLXMenu::checkItem(
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 934fdb095684..74d529c7d2c7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -123,7 +123,6 @@ Menu::Menu()
       nEventId(nullptr),
       mnHighlightedItemPos(ITEMPOS_INVALID),
       nMenuFlags(MenuFlags::NONE),
-      nDefaultItem(0),
       nSelectedId(0),
       nImgOrChkPos(0),
       nTextPos(0),
@@ -1204,7 +1203,6 @@ Menu& Menu::operator=( const Menu& rMenu )
     for ( sal_uInt16 i = 0; i < nCount; i++ )
         ImplCopyItem( this, rMenu, i, MENU_APPEND );
 
-    nDefaultItem = rMenu.nDefaultItem;
     aActivateHdl = rMenu.aActivateHdl;
     aDeactivateHdl = rMenu.aDeactivateHdl;
     aSelectHdl = rMenu.aSelectHdl;
@@ -2742,8 +2740,6 @@ PopupMenu::PopupMenu( const ResId& rResId )
     {
         aTitleText = ReadStringRes();
     }
-    if( nObjMask & RscMenu::DefaultItemId )
-        SetDefaultItem( sal::static_int_cast<sal_uInt16>(ReadLongRes()) );
 }
 
 PopupMenu::PopupMenu( const PopupMenu& rMenu )