remove freshly unused menu support from src files

Change-Id: I038711a0c4d440d452d5b2ae1bfcba5c9305815b
Reviewed-on: https://gerrit.libreoffice.org/36646
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

44 files changed, 6 insertions, 185 deletions

diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index b5d4fd1a64c3..f51afc873b91 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -282,7 +282,6 @@
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
-#include <tools/rc.h>
 #include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 34b45cf5b3be..193f436d4061 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -21,8 +21,8 @@
 
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 
+#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
-#include <tools/rc.h>
 #include <vcl/svapp.hxx>
 
 using namespace css;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 64c078e070fa..122a71ef55be 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -20,7 +20,6 @@
 #include <tools/debug.hxx>
 #include <tools/lineend.hxx>
 #include <tools/poly.hxx>
-#include <tools/rc.h>
 
 #include <vcl/image.hxx>
 #include <vcl/bitmap.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 01eac4eb3d07..a0218d8ada95 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -23,7 +23,6 @@
 
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 #include <vcl/decoview.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 229051b58ae6..8d94ebc26fce 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -19,7 +19,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <tools/rc.h>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index c20ef78cf3fa..70cebbbc77f3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 68baa147006a..a1c1ea8897b9 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -24,8 +24,6 @@
 
 #include "tools/debug.hxx"
 
-#include "tools/rc.h"
-
 #include <vcl/dialog.hxx>
 #include <vcl/field.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index ff5897737313..51fc1f6607e7 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -24,7 +24,6 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <tools/rc.h>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 42b6cc1ef1ab..fa95ee3d2404 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "tools/rc.h"
-
 #include <vcl/decoview.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 9d8070cc9b01..dfcf58f75905 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
-
 #include <vcl/event.hxx>
 #include <vcl/group.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 4e3d9dc454b1..2e3334efea81 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "tools/rc.h"
 #include "tools/debug.hxx"
 
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index ce04daf4eb41..f2409df06848 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -21,8 +21,6 @@
 #include <tools/debug.hxx>
 #include <tools/bigint.hxx>
 
-#include <tools/rc.h>
-
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/longcurr.hxx>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 79d09a6687f9..92a3b96719e0 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index cb66fcd005c1..acff4e0be2f2 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/morebtn.hxx>
 
-#include <tools/rc.h>
 #include <vector>
 
 struct ImplMoreButtonData
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 40dfd14aa0f8..7ecb6702e353 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -26,7 +26,6 @@
 #include "svdata.hxx"
 
 #include "rtl/string.hxx"
-#include "tools/rc.h"
 
 /*  #i77549#
     HACK: for scrollbars in case of thumb rect, page up and page down rect we
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 51e894b280c7..f1a71c9af7c4 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/slider.hxx>
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 84fb780d50f6..985656aa603a 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "tools/rc.h"
-
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/spinfld.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 6e21f9511f78..4f87c097f88d 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "tools/debug.hxx"
-#include "tools/rc.h"
 
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index f9eeca9f767d..ff0c32dfa60f 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 55952b77943d..274126dd920a 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -26,6 +26,7 @@
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <tools/fract.hxx>
+#include <tools/resmgr.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/zcodec.hxx>
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 6af9bcd37730..e496ecd76800 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -21,7 +21,6 @@
 #include <rtl/crc.h>
 #include <tools/stream.hxx>
 #include <tools/poly.hxx>
-#include <tools/rc.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 1231ab165367..0f709c2b03f5 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -21,9 +21,10 @@
 #include <rtl/strbuf.hxx>
 
 #include <o3tl/any.hxx>
-#include <tools/stream.hxx>
 #include <tools/debug.hxx>
-#include <tools/rc.h>
+#include <tools/rcid.h>
+#include <tools/resmgr.hxx>
+#include <tools/stream.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 649bf1551cf3..fc4e9fa80401 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -20,7 +20,6 @@
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <tools/rc.h>
 #include <tools/rc.hxx>
 #include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 78514bfb7083..8810bdba04c1 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index fa155db1df0c..cb82b6916205 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -23,7 +23,6 @@
 
 #include "tools/time.hxx"
 #include "tools/debug.hxx"
-#include "tools/rc.h"
 
 #include "unotools/fontcfg.hxx"
 #include "unotools/confignode.hxx"
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 5ff1f358baa1..7f2423ffd3bd 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
-
 #include <svdata.hxx>
 
 #include <vcl/button.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 45713fd85333..879526dcaa7f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -27,7 +27,6 @@
 
 #include <tools/debug.hxx>
 
-#include <tools/rc.h>
 #include <svdata.hxx>
 #include <window.h>
 #include <brdwin.hxx>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index a68d5b1fbd6d..70f45b59a434 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/time.hxx>
-#include <tools/rc.h>
 
 #include <brdwin.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 4f61ff8aed92..a6e828fe2d3c 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/time.hxx>
-#include <tools/rc.h>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dockwin.hxx>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 9b27d56b6617..f0336c8f8a27 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -30,7 +30,6 @@
 #include <vcl/floatwin.hxx>
 #include <vcl/settings.hxx>
 
-#include <tools/rc.h>
 #include <tools/debug.hxx>
 
 class FloatingWindow::ImplData
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 7f7661ee1ad6..93e16339df06 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -24,8 +24,6 @@
 #include <vcl/window.hxx>
 #include <vcl/keycod.hxx>
 
-#include <tools/rc.h>
-
 static const sal_uInt16 aImplKeyFuncTab[(static_cast<int>(KeyFuncType::FRONT)+1)*4] =
 {
     0, 0, 0, 0,                                                    // KeyFuncType::DONTKNOW
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 668ed11b9067..5991f123530d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -19,7 +19,6 @@
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/rc.h>
 #include <tools/stream.hxx>
 
 #include <vcl/svapp.hxx>
@@ -438,88 +437,6 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr,
     SetItemImage( nItemId, rImage );
 }
 
-void Menu::InsertItem( const ResId& rResId )
-{
-    ResMgr* pMgr = rResId.GetResMgr();
-    if( ! pMgr )
-        return;
-
-    RscMenuItem              nObjMask;
-
-    GetRes( rResId.SetRT( RSC_MENUITEM ) );
-    nObjMask    = (RscMenuItem)ReadLongRes();
-
-    bool bSep = false;
-    if ( nObjMask & RscMenuItem::Separator )
-        bSep = ReadShortRes() != 0;
-
-    sal_uInt16 nItemId = 1;
-    if ( nObjMask & RscMenuItem::Id )
-        nItemId = sal::static_int_cast<sal_uInt16>(ReadLongRes());
-
-    MenuItemBits nStatus = MenuItemBits::NONE;
-    if ( nObjMask & RscMenuItem::Status )
-        nStatus = sal::static_int_cast<MenuItemBits>(ReadLongRes());
-
-    OUString aText;
-    if ( nObjMask & RscMenuItem::Text )
-        aText = ReadStringRes();
-
-    // create item
-    if (!bSep)
-        InsertItem(nItemId, aText, nStatus);
-    else
-        InsertSeparator();
-
-    OUString aHelpText;
-    if ( nObjMask & RscMenuItem::HelpText )
-    {
-        aHelpText = ReadStringRes();
-        if( !bSep )
-            SetHelpText( nItemId, aHelpText );
-    }
-
-    if ( nObjMask & RscMenuItem::HelpId )
-    {
-        OString aHelpId( ReadByteStringRes() );
-        if ( !bSep )
-            SetHelpId( nItemId, aHelpId );
-    }
-
-    if( !bSep )
-        SetHelpText( nItemId, aHelpText );
-
-    if ( nObjMask & RscMenuItem::Disable )
-    {
-        if ( !bSep )
-            EnableItem( nItemId, ReadShortRes() == 0 );
-    }
-    if ( nObjMask & RscMenuItem::Command )
-    {
-        OUString aCommandStr = ReadStringRes();
-        if ( !bSep )
-            SetItemCommand( nItemId, aCommandStr );
-    }
-    if ( nObjMask & RscMenuItem::Menu )
-    {
-        if ( !bSep )
-        {
-            MenuItemData* pData = GetItemList()->GetData( nItemId );
-            if ( pData )
-            {
-                VclPtr<PopupMenu> pSubMenu = VclPtr<PopupMenu>::Create( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *pMgr ) );
-                pData->pAutoSubMenu = pSubMenu;
-                // #111060# keep track of this pointer, may be it will be deleted from outside
-                pSubMenu->pRefAutoSubMenu = &pData->pAutoSubMenu;
-                SetPopupMenu( nItemId, pSubMenu );
-            }
-        }
-        IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) );
-    }
-    delete mpLayoutData;
-    mpLayoutData = nullptr;
-}
-
 void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame)
 {
     sal_uInt16 nItemId = GetItemCount() + 1;
@@ -2728,45 +2645,12 @@ MenuFloatingWindow * PopupMenu::ImplGetFloatingWindow() const {
 }
 
 PopupMenu::PopupMenu()
-    : pRefAutoSubMenu(nullptr)
 {
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
 }
 
-PopupMenu::PopupMenu( const ResId& rResId )
-    : pRefAutoSubMenu(nullptr)
-{
-    mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
-
-    ResMgr* pMgr = rResId.GetResMgr();
-    if( ! pMgr )
-        return;
-
-    rResId.SetRT( RSC_MENU );
-    GetRes( rResId );
-
-    RscMenu nObjMask = (RscMenu)ReadLongRes();
-
-    if( nObjMask & RscMenu::Items )
-    {
-        sal_uLong nObjFollows = ReadLongRes();
-        // insert menu items
-        for( sal_uLong i = 0; i < nObjFollows; i++ )
-        {
-            InsertItem( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *pMgr ) );
-            IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) );
-        }
-    }
-
-    if( nObjMask & RscMenu::Text )
-    {
-        aTitleText = ReadStringRes();
-    }
-}
-
 PopupMenu::PopupMenu( const PopupMenu& rMenu )
-    : Menu(),
-      pRefAutoSubMenu(nullptr)
+    : Menu()
 {
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
     *this = rMenu;
@@ -2777,13 +2661,6 @@ PopupMenu::~PopupMenu()
     disposeOnce();
 }
 
-void PopupMenu::dispose()
-{
-    if( pRefAutoSubMenu && *pRefAutoSubMenu == this )
-        *pRefAutoSubMenu = nullptr;    // #111060# avoid second delete in ~MenuItemData
-    Menu::dispose();
-}
-
 void PopupMenu::ClosePopup(Menu* pMenu)
 {
     MenuFloatingWindow* p = dynamic_cast<MenuFloatingWindow*>(ImplGetWindow());
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 67cdb6af2cce..f2a9e41a08f8 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -34,11 +34,6 @@ MenuItemData::~MenuItemData()
 {
     if (aUserValueReleaseFunc)
         aUserValueReleaseFunc(nUserValue);
-    if( pAutoSubMenu )
-    {
-        static_cast<PopupMenu*>(pAutoSubMenu.get())->pRefAutoSubMenu = nullptr;
-        pAutoSubMenu.disposeAndClear();
-    }
     if( pSalMenuItem )
         ImplGetSVData()->mpDefInst->DestroyMenuItem( pSalMenuItem );
     pSubMenu.disposeAndClear();
@@ -67,7 +62,6 @@ MenuItemData* MenuItemList::Insert(
     pData->eType            = eType;
     pData->nBits            = nBits;
     pData->pSubMenu         = nullptr;
-    pData->pAutoSubMenu     = nullptr;
     pData->nUserValue       = 0;
     pData->bChecked         = false;
     pData->bEnabled         = true;
@@ -101,7 +95,6 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
     pData->eType            = MenuItemType::SEPARATOR;
     pData->nBits            = MenuItemBits::NONE;
     pData->pSubMenu         = nullptr;
-    pData->pAutoSubMenu     = nullptr;
     pData->nUserValue       = 0;
     pData->bChecked         = false;
     pData->bEnabled         = true;
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index dbcc4c805dfb..e8b970fbe550 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -34,7 +34,6 @@ struct MenuItemData
     MenuItemType    eType;                  // MenuItem-Type
     MenuItemBits    nBits;                  // MenuItem-Bits
     VclPtr<Menu>    pSubMenu;               // Pointer to SubMenu
-    VclPtr<Menu>    pAutoSubMenu;           // Pointer to SubMenu from Resource
     OUString        aText;                  // Menu-Text
     OUString        aHelpText;              // Help-String
     OUString        aTipHelpText;           // TipHelp-String (eg, expanded filenames)
@@ -60,7 +59,6 @@ struct MenuItemData
         , eType(MenuItemType::DONTKNOW)
         , nBits(MenuItemBits::NONE)
         , pSubMenu(nullptr)
-        , pAutoSubMenu(nullptr)
         , nUserValue(0)
         , aUserValueReleaseFunc(nullptr)
         , bChecked(false)
@@ -75,7 +73,6 @@ struct MenuItemData
         , eType(MenuItemType::DONTKNOW)
         , nBits(MenuItemBits::NONE)
         , pSubMenu(nullptr)
-        , pAutoSubMenu(nullptr)
         , aText(rStr)
         , nUserValue(0)
         , aUserValueReleaseFunc(nullptr)
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 1686a9378fda..ef98a62246d1 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
-
 #include <svids.hrc>
 #include <svdata.hxx>
 #include <brdwin.hxx>
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 0243de205deb..ad991269c258 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
 #include <tools/poly.hxx>
 
 #include <vcl/event.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index be5f53e311ea..e32c4df8b81f 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 3b8c90a390b4..9c24cf3c3358 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -22,8 +22,6 @@
 #include <rtl/process.h>
 #include <rtl/ref.hxx>
 
-#include <tools/rc.h>
-
 #include <vcl/window.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 5fb80a3b09f9..f25324a34d73 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -22,7 +22,6 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabpage.hxx>
-#include <tools/rc.h>
 
 void TabDialog::ImplInitTabDialogData()
 {
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 59c5a653681c..3e095a4d566a 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rc.h>
-
 #include <vcl/event.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8589a9b01a0a..ae8382beeab4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -33,7 +33,6 @@
 #include <vcl/vclstatuslistener.hxx>
 
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 #include <tools/poly.hxx>
 #include <svl/imageitm.hxx>
 
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 19cc5a029648..a8fd640005f1 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -21,7 +21,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 
 #include <vcl/svapp.hxx>
 #include <vcl/idle.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c15ba9c3861e..a867ab5a6453 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -19,7 +19,6 @@
 
 #include <config_features.h>
 #include <rtl/strbuf.hxx>
-#include <tools/rc.h>
 
 #include <sal/types.h>
 #include <vcl/salgtype.hxx>
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 1c75de766cb8..448ed9c0c79b 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/debug.hxx>
-#include <tools/rc.h>
 
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>