tdf#42949 Fix IWYU warnings in include/svx/x*
New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I5b91a82d25601041b73444f602d033ef62484ba8
Reviewed-on: https://gerrit.libreoffice.org/74563
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4b2dd2f..7ec1b38 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -22,6 +22,7 @@
#include <svtools/valueset.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflasit.hxx>
#include <svx/tabarea.hxx>
#include <svx/hexcolorcontrol.hxx>
#include <svx/SvxColorValueSet.hxx>
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index e36febd..34156ada 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -24,6 +24,7 @@
#include <svx/svdpage.hxx>
#include <svx/tabline.hxx>
#include <svx/tabarea.hxx>
#include <svx/xlnasit.hxx>
enum class PageType;
class ColorListBox;
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 3141da5..a9b99c1 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -1041,3 +1041,9 @@ blacklist:
- com/sun/star/drawing/CameraGeometry.hpp
- com/sun/star/text/WritingMode.hpp
- com/sun/star/graphic/XGraphic.hpp
include/svx/xdef.hxx:
# Needed for macro defines
- svl/typedwhich.hxx
include/svx/svdtext.hxx:
# TODO too many replacements would be needed
- tools/weakbase.hxx
diff --git a/include/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx
index 9e52d29..4bec7a9 100644
--- a/include/svx/XPropertyTable.hxx
+++ b/include/svx/XPropertyTable.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XPROPERTYTABLE_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <svx/svxdllapi.h>
#include <svx/xtable.hxx>
// FIXME: should have a single factory method with an enumeration here [!]
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 62a4303..3ffb179 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -26,7 +26,6 @@
#include <sfx2/childwin.hxx>
#include <svx/svxdllapi.h>
#include <tools/poly.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/window.hxx>
class SfxBindings;
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index ac4864a..f501b71 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -24,7 +24,6 @@
#include <sal/types.h>
#include <svx/svxdllapi.h>
#include <vcl/svlbitm.hxx>
#include <tools/color.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/link.hxx>
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 53047ce..1a74323 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_GRAPHCTL_HXX
#define INCLUDED_SVX_GRAPHCTL_HXX
#include <vcl/ctrl.hxx>
#include <vcl/graph.hxx>
#include <vcl/customweld.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index c3aaf62..d12ddbd 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -23,6 +23,7 @@
#include <vcl/field.hxx>
#include <vcl/layout.hxx>
#include <memory>
#include <svl/poolitem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx>
#include <svx/sidebar/LineWidthPopup.hxx>
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 94578d9..ee006ad 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -21,6 +21,7 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <svl/poolitem.hxx>
#include <svl/srchdefs.hxx>
#include <svx/svxdllapi.h>
#include <memory>
diff --git a/include/svx/strarray.hxx b/include/svx/strarray.hxx
index faa5ee3..f0cc28a 100644
--- a/include/svx/strarray.hxx
+++ b/include/svx/strarray.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SVX_STRARRAY_HXX
#define INCLUDED_SVX_STRARRAY_HXX
#include <rtl/ustring.hxx>
#include <tools/fldunit.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index 1abce16..dd312bf 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_SVDTEXT_HXX
#define INCLUDED_SVX_SVDTEXT_HXX
#include <sal/types.h>
#include <svx/sdr/properties/defaultproperties.hxx>
#include <svx/svxdllapi.h>
#include <tools/weakbase.hxx>
#include <memory>
diff --git a/include/svx/transfrmhelper.hxx b/include/svx/transfrmhelper.hxx
index 0fe9206..19ddbfa 100644
--- a/include/svx/transfrmhelper.hxx
+++ b/include/svx/transfrmhelper.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_SVX_TRANSFRMHELPER_HXX
#include <basegfx/range/b2drange.hxx>
#include <svx/svxdllapi.h>
#include <tools/fract.hxx>
#include <tools/fldunit.hxx>
#include <tools/mapunit.hxx>
#include <vcl/field.hxx>
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 3f817cd..92c71fa 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -22,9 +22,7 @@
#include <memory>
#include <tools/color.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/GraphicObject.hxx>
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
class SVX_DLLPUBLIC XOBitmap
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 8987aaf..2c1ea76 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_SVX_XBTMPIT_HXX
#include <svx/svxdllapi.h>
#include <svx/xdef.hxx>
#include <svx/xit.hxx>
#include <vcl/GraphicObject.hxx>
#include <array>
class SdrModel;
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index ef28add1..275e01f 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -24,7 +24,6 @@
// class XDash
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/drawing/DashStyle.hpp>
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 92f1a35..a5c12ea 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -22,8 +22,6 @@
#include <svl/eitem.hxx>
#include <svx/xdef.hxx>
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 159c686..5f136e2 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_XFLGRIT_HXX
#define INCLUDED_SVX_XFLGRIT_HXX
#include <svx/xdef.hxx>
#include <svx/xit.hxx>
#include <svx/xgrad.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index a81e723..760d89b 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_XFLHTIT_HXX
#define INCLUDED_SVX_XFLHTIT_HXX
#include <svx/xdef.hxx>
#include <svx/xit.hxx>
#include <svx/xhatch.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index c4b6711..88c1595 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -22,6 +22,7 @@
#include <svl/eitem.hxx>
#include <svx/svxdllapi.h>
#include <svx/xenum.hxx>
/*************************************************************************
|*
diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx
index ed46bd4..0f69b3d 100644
--- a/include/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
@@ -20,7 +20,8 @@
#ifndef INCLUDED_SVX_XFTOUIT_HXX
#define INCLUDED_SVX_XFTOUIT_HXX
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
/*************************************************************************
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 554746d..e31a4d2 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_XGRAD_HXX
#define INCLUDED_SVX_XGRAD_HXX
#include <svx/xenum.hxx>
#include <tools/color.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/awt/GradientStyle.hpp>
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 871a134..0ca9124 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -22,7 +22,6 @@
#include <svl/stritem.hxx>
#include <svx/xtable.hxx>
#include <svx/xdef.hxx>
#include <svx/svxdllapi.h>
/************************************************************************/
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index 2771df5..2e58f04 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_XLINEIT0_HXX
#define INCLUDED_SVX_XLINEIT0_HXX
#include <svx/xenum.hxx>
#include <svl/eitem.hxx>
// class LineStyleItem
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index b37aed1..fb5eb04 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XLINJOIT_HXX
#include <svl/eitem.hxx>
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/drawing/LineJoint.hpp>
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 57f49e0..5df5636 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -22,7 +22,6 @@
#include <svx/svxdllapi.h>
#include <svl/eitem.hxx>
#include <svx/xenum.hxx>
#include <com/sun/star/drawing/LineCap.hpp>
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index a19e5060..f853ba2 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_XLNDSIT_HXX
#define INCLUDED_SVX_XLNDSIT_HXX
#include <svx/xdef.hxx>
#include <svx/xit.hxx>
#include <svx/xdash.hxx>
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 0e9a717..0b32271 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -22,12 +22,13 @@
#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <svx/svxdllapi.h>
#include <rtl/ref.hxx>
#include <tools/stream.hxx>
#include <map>
#include <memory>
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index f04c33e..6da78ee 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -22,10 +22,9 @@
#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
#include <vcl/GraphicObject.hxx>
#include <vcl/graph.hxx>
#include <rtl/ref.hxx>
#include <vector>
#include <set>
#include <unordered_map>
#include <utility>
#include <com/sun/star/document/XGraphicObjectResolver.hpp>
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index b849cbe..f1446b9 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/xdef.hxx>
#include <svx/svxdllapi.h>
#include <memory>
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 8faf39d..6d51d39 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -21,15 +21,11 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <svx/xpoly.hxx>
#include <svx/xdash.hxx>
#include <svx/xhatch.hxx>
#include <svx/xgrad.hxx>
#include <svx/xflasit.hxx>
#include <svx/xlnasit.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index ec751d4..b359b80 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -21,6 +21,7 @@
#include <sdmod.hxx>
#include <sdiocmpt.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xlineit0.hxx>
#include <svx/svdobj.hxx>
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index f380a4f..38c8ee8 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -28,6 +28,7 @@
#include <svl/itemset.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 66278b2..7f5e92e 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -23,6 +23,7 @@
#include <svl/itemset.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdpool.hxx>
#include <svx/xdef.hxx>
#include <vcl/outdev.hxx>
#include <tools/debug.hxx>
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 61929a9..457db8e 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -22,6 +22,7 @@
#include <svl/itemset.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svditer.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
#include <vcl/outdev.hxx>
#include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index d79054f..2c01f1e 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -21,6 +21,7 @@
#include <sdr/contact/viewcontactofmasterpagedescriptor.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdobj.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
#include <svl/itemset.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index eae599c..43650c1 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -102,6 +102,7 @@
#include <svx/tbxcolorupdate.hxx>
#include <editeng/eerdll.hxx>
#include <editeng/editrids.hrc>
#include <svx/xdef.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 202d9ff..49272f3 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -43,6 +43,7 @@
#include <vcl/metaact.hxx>
#include <tools/zcodec.hxx>
#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <svx/xmlgrhlp.hxx>
#include <svx/xmleohlp.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 7f0d0ac..7c27314 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -46,7 +46,9 @@
#include <svl/itemset.hxx>
#include <svx/strings.hrc>
#include <svx/xfillit0.hxx>
#include <svx/xflasit.hxx>
#include <svx/xlineit0.hxx>
#include <svx/xlnasit.hxx>
#include <svx/xtextit0.hxx>
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 9d2348a..8f9aeaa 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -33,6 +33,7 @@
#include <svx/xlntrit.hxx>
#include <svx/xfltrit.hxx>
#include <svx/xgrscit.hxx>
#include <svx/xflasit.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflbmpit.hxx>
#include <svx/xflbmsxy.hxx>
@@ -43,6 +44,7 @@
#include <svx/xlncapit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xtextit0.hxx>
#include <svx/xlnasit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlnclit.hxx>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index fe657d3..d415f81 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -37,6 +37,7 @@
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/content.hxx>
#include <swunohelper.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
#include <editeng/memberids.h>
#include <svl/itemset.hxx>
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 51adff8..ec317ea 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -42,7 +42,11 @@
#include <tools/fldunit.hxx>
#include <svl/poolitem.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/itemwin.hxx>
#include <svx/pagenumberlistbox.hxx>
