don't need to include vcl/menu.hxx here

Change-Id: I16c4c2fd84ea8af6b7601e49c38630bbbfdb2cb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107746
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

25 files changed, 27 insertions, 7 deletions

diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 29fea97781a6..26f384fbbbce 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -28,6 +28,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <vector>
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index e3ac323e11ff..4a8ab6fe0e54 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -49,6 +49,7 @@
 #include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/commandevent.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/txtattr.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 51ebcbf9b567..d9879174656d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -78,6 +78,7 @@
 #include <svx/svddrgmt.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 2466f22df062..1d7019a81b29 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -52,10 +52,11 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <vcl/weld.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
+#include <vcl/weld.hxx>
 #include <osl/mutex.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 65b30505fbfc..ba5db408ba2d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -39,6 +39,7 @@
 #include <svl/numuno.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
+#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svl/zforlist.hxx>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1bcb127d9ba6..082a1949d875 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -38,6 +38,7 @@
 #include <strings.hxx>
 #include <helpids.h>
 #include "QTableWindow.hxx"
+#include <vcl/menu.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 61e583e238ec..9770428804e3 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -34,6 +34,7 @@
 #include <svtools/imgdef.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/event.hxx>
 #include <bitmaps.hlst>
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index ee46d5c89909..6e87c89217f4 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -30,9 +30,9 @@
 #include <o3tl/span.hxx>
 
 #include <boost/property_tree/ptree_fwd.hpp>
-#include <vcl/menu.hxx>
 #include <initializer_list>
 
+class Menu;
 class SfxSlotServer;
 class SfxRequest;
 class SfxViewFrame;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index c3b429613b80..77b6fd91f5d0 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -23,10 +23,11 @@
 #include <sfx2/sidebar/ResourceManager.hxx>
 
 #include <vcl/InterimItemWindow.hxx>
-#include <vcl/menu.hxx>
 
 #include <functional>
 
+namespace com::sun::star::frame { class XFrame; }
+
 namespace svt { class AcceleratorExecute; }
 
 namespace weld { class Toolbar; }
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index a045d390fa61..9304e858ad9b 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -12,7 +12,6 @@
 
 #include <sfx2/thumbnailview.hxx>
 #include <sfx2/templateproperties.hxx>
-#include <vcl/menu.hxx>
 #include <functional>
 #include <memory>
 #include <set>
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index d5d15d0054e4..e09b0a146284 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -26,7 +26,6 @@
 #include <svtools/recorditemwindow.hxx>
 #include <osl/mutex.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/menu.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 #include <vector>
@@ -40,6 +39,7 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatter; }
 
 class CursorWrapper;
+class PopupMenu;
 
 bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight);
 
diff --git a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
index 7d4c68d41f03..87c843620c68 100644
--- a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
@@ -23,7 +23,6 @@
 #include <vcl/builder.hxx>
 #include <vcl/window.hxx>
 #include <vcl/image.hxx>
-#include <vcl/menu.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 42ed619445e2..e79e32357a8d 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -37,6 +37,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index ace815efbf9b..aca5d41bf3b3 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -50,6 +50,7 @@
 #include <rptui_slotid.hrc>
 
 #include <vcl/commandevent.hxx>
+#include <vcl/menu.hxx>
 
 #include <svl/itempool.hxx>
 #include <svtools/extcolorcfg.hxx>
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index ced6d0c70eb3..4d94fe494478 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -85,6 +85,8 @@
 #include <scmod.hxx>
 #include <scdll.hxx>
 
+#include <list>
+
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 654554a17dbe..243dd206f655 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -40,6 +40,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/inputctx.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <sot/formats.hxx>
 #include <comphelper/classids.hxx>
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 4d61b2e06fec..a85a2ae5295a 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <tabcont.hxx>
 #include <tabvwsh.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index f803bffc15a2..26266a6ee747 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -26,6 +26,7 @@
 #include <vcl/builderpage.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index de98fb5e228a..9939b01f0b90 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -63,6 +63,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/menu.hxx>
 
 #include <sfxtypes.hxx>
 #include <slotserv.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 7be3383bedff..cab0ebd4be6a 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -22,6 +22,7 @@
 #include <vcl/accel.hxx>
 #include <vcl/event.hxx>
 #include <vcl/help.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index 8a637ae1af48..80277b10d723 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/notebookbar/notebookbar.hxx>
 #include <vcl/tabpage.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 919b736a6b8c..42431f20ed42 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -23,8 +23,9 @@
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/whiter.hxx>
-#include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
 #include <vcl/weld.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/langhelp.hxx>
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 66457d3bca1e..0bb778bf2595 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -25,6 +25,7 @@
 #include <vcl/event.hxx>
 #include <vcl/fieldvalues.hxx>
 #include <vcl/image.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 41436ab30587..e6f3fa7948a0 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -39,6 +39,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/event.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/ustring.hxx>
 #include <swabstdlg.hxx>
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index b2e3d4649939..f6f9fe37db56 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -24,6 +24,7 @@
 #include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/toolbox.hxx>
 #include <OptionalBox.hxx>