tdf#42949 Fix IWYU warnings in include/[t-x]*/*hxx

Recheck after 7-0 branchoff

Also drop the now unused file include/vcl/field.hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I9e54c82f50d1e02a0f99858939cac999fc66f7de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99261
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

34 files changed, 17 insertions, 41 deletions

diff --git a/include/svx/AccessibilityCheckDialog.hxx b/include/svx/AccessibilityCheckDialog.hxx
index 9c17aba2921f..5227cbee2699 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -11,10 +11,8 @@
 #ifndef INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
 #define INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
 
-#include <sfx2/AccessibilityCheck.hxx>
-#include <sal/types.h>
+#include <sfx2/AccessibilityIssue.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/include/svx/DiagramDataInterface.hxx b/include/svx/DiagramDataInterface.hxx
index f64dc3a09316..7279ec882675 100644
--- a/include/svx/DiagramDataInterface.hxx
+++ b/include/svx/DiagramDataInterface.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
 #define INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
 
-#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
 
 #include <utility>
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index c505eb412d44..96417c7d3257 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_PALETTE_HXX
 
 #include <rtl/ustring.hxx>
-#include <svx/svxdllapi.h>
 
 class Color;
 class SvxColorValueSet;
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index a595b9570ddb..b76b3adfcb2e 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 
 #include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
 
 namespace svx {
 
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
index 0c7b5b04f2d8..4ed191942084 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
 
 #include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
 
 namespace svx {
 
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 1d4074f8b9f8..530b486a5c7f 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
 
 #include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
 
 namespace svx {
 
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index dde83d149812..7bb6a3d13a37 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -30,7 +30,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/vclptr.hxx>
 #include <memory>
 
 namespace vcl { class Window; }
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index e587dbc3db6d..3ad1fba53683 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_CHARTHELPER_HXX
 #define INCLUDED_SVX_CHARTHELPER_HXX
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index d4eb26650703..29c255506c89 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_DIALCONTROL_HXX
 #define INCLUDED_SVX_DIALCONTROL_HXX
 
-#include <config_options.h>
 #include <memory>
 #include <vcl/customweld.hxx>
 #include <vcl/virdev.hxx>
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 194383b529c7..7c40b336108b 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
 #define INCLUDED_SVX_FRAMELINKARRAY_HXX
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/rotmodit.hxx>
 #include <memory>
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 4bb37f68fd7a..61fd62927a2d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c0c1bf260670..4c3748c7b145 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -26,7 +26,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/salctype.hxx>
+#include <vcl/bitmapex.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svx/galmisc.hxx>
 #include <memory>
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index a270d25f0e3c..32e5f5bcc06c 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_SVX_ITEMWIN_HXX
 #define INCLUDED_SVX_ITEMWIN_HXX
 
-#include <vcl/InterimItemWindow.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/xtable.hxx>
+#include <vcl/customweld.hxx>
 
 class SfxObjectShell;
 class ValueSet;
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index 9b9e5fe13acf..a6caf1e18dcb 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_LAYCTRL_HXX
 
 #include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
 
 class SvxTableToolBoxControl final : public svt::PopupWindowController
 {
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 0b4b72139d7e..6799078f20a8 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
 
 class ToolBox;
 class SvxPopupWindowListBox;
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
index 4a966122010c..b8d1362b4464 100644
--- a/include/svx/legacyitem.hxx
+++ b/include/svx/legacyitem.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_LEGACYITEM_HXX
 #define INCLUDED_SVX_LEGACYITEM_HXX
 
-#include <svx/svxdllapi.h>
+#include <sal/types.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // // svx
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index e04872ff975a..9d1fbc8daf47 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SDGMOITM_HXX
 #define INCLUDED_SVX_SDGMOITM_HXX
 
-#include <vcl/GraphicObject.hxx>
+#include <vcl/GraphicAttributes.hxx>
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 3284a68386c6..078cc6342801 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 #include <svx/sdr/animation/scheduler.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 namespace sdr::contact { class ViewObjectContact; }
 
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 6b72b7d0efec..c8c22af9b71c 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -22,7 +22,7 @@
 #include <svx/svxdllapi.h>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <svl/itemset.hxx>
 #include <memory>
 
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index c3e9328d954f..de3ceb316332 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 class SdrLayerIDSet;
 class SdrPage;
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 9c806aa08e46..a12cb0b2915e 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -22,7 +22,7 @@
 
 #include <memory>
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 namespace vcl { class Region; }
 
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 1dc69d2383d1..a07217ca64be 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 namespace sdr::contact {
 
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index f8cf8be0b7ff..d4ef56646171 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -25,7 +25,7 @@
 #include <tools/color.hxx>
 #include <svx/sdr/animation/scheduler.hxx>
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 #include <vector>
 
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 5562fa381014..fd5a87ac6404 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 
 namespace sdr::overlay
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index ded8adf06ca5..c9e12c322a5d 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/svxdllapi.h>
 #include <cppuhelper/weak.hxx>
-#include <memory>
 
 class KeyEvent;
 class MouseEvent;
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 455acddeed32..bdef4e11e7b8 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
 #define INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
 
-#include <config_options.h>
 #include <svx/svxdllapi.h>
 #include <svx/shapeproperty.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 2ea0356dbb27..a3103b6c04c2 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -22,10 +22,8 @@
 #include <memory>
 #include <svx/sidebar/AreaTransparencyGradientPopup.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/xgrad.hxx>
-#include <svx/itemwin.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xflgrit.hxx>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 1d73c7653edd..359b822e16b1 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -22,9 +22,7 @@
 #include <vcl/weld.hxx>
 #include <memory>
 #include <svl/poolitem.hxx>
-#include <svx/dlgctrl.hxx>
 #include <sfx2/sidebar/PanelLayout.hxx>
-#include <svx/xtable.hxx>
 #include <svx/sidebar/LineWidthPopup.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/signaturelinehelper.hxx b/include/svx/signaturelinehelper.hxx
index 70ddbfbf7905..b4a34749d101 100644
--- a/include/svx/signaturelinehelper.hxx
+++ b/include/svx/signaturelinehelper.hxx
@@ -13,7 +13,6 @@
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
 
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index f58fd0fe3d9d..ef2be491ce6c 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -23,14 +23,12 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/drawing/QRCode.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/graph.hxx>
 #include <svx/svdorect.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
-#include <cstddef>
 
 namespace sdr
 {
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 6f1804bb1757..41e9baa3faa9 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -30,7 +30,7 @@
 #include <svl/style.hxx>
 #include <svx/svdtext.hxx>
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 3614ae4fe309..c020ccd52a8d 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -132,7 +132,6 @@
 
 #include <config_options.h>
 #include <svl/style.hxx>
-#include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <svtools/popupwindowcontroller.hxx>
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index 6dc437ec383a..324e650a64f7 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -24,8 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <svtools/toolboxcontroller.hxx>
 
-#include <svx/svxdllapi.h>
-
 //HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC:
 class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base:
     public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo>
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index a7ec8c67cc27..0b31df19acb7 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_XPOOL_HXX
 
 #include <svl/itempool.hxx>
-#include <svx/svxdllapi.h>
 #include <memory>
 
 /*************************************************************************