tdf#42949 Fix IWYU warnings in include/
Recheck directories in include/ between vcl
and svx in the module hierarchy
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.
Change-Id: Ieab6083ee2aae33baf32d05943b07ad2de6f9d7f
Reviewed-on: https://gerrit.libreoffice.org/75170
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index a9b99c1..e9b112c 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -279,6 +279,10 @@ blacklist:
include/vcl/FilterConfigItem.hxx:
# Needed on Windows with --disable-pch
- com/sun/star/beans/PropertyValue.hpp
include/vcl/builderfactory.hxx:
# Needed for macro #define
- vcl/builder.hxx
- vcl/vclptr.hxx
include/vcl/decoview.hxx:
# Full definition needed for VclPtr
- vcl/outdev.hxx
@@ -298,6 +302,14 @@ blacklist:
include/vcl/mtfxmldump.hxx:
# Full definition needed for o3tl::enumarray
- vcl/metaactiontypes.hxx
include/vcl/salbtype.hxx:
# TODO remove this file entirely, contains only these headers now
- vcl/BitmapAccessMode.hxx
- vcl/BitmapBuffer.hxx
- vcl/BitmapColor.hxx
- vcl/BitmapPalette.hxx
- vcl/ColorMask.hxx
- vcl/Scanline.hxx
include/vcl/outdevstate.hxx:
# Full definition needed for boost::optional
- vcl/mapmod.hxx
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 3166e7f..371b234 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_CANVAS_BASE_CANVASBASE_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/rendering/TextDirection.hpp>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index cb75f50..f67a784 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
#define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
#include <com/sun/star/rendering/XCanvas.hpp>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index b7b3b22..5590178 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -20,6 +20,12 @@
#ifndef INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
#define INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
#include <com/sun/star/rendering/XBufferController.hpp>
#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
#include <com/sun/star/rendering/XVolatileBitmap.hpp>
#include <rtl/ref.hxx>
#include <canvas/parametricpolypolygon.hxx>
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 6135ebb..3321eb6 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_CPPCANVAS_SPRITE_HXX
#define INCLUDED_CPPCANVAS_SPRITE_HXX
#include <memory>
namespace basegfx
{
class B2DHomMatrix;
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 3f25e34..8d51697 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/document/CmisProperty.hpp>
diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx
index 1e6823c..7829fa8 100644
--- a/include/sfx2/groupid.hxx
+++ b/include/sfx2/groupid.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SFX2_GROUPID_HXX
#define INCLUDED_SFX2_GROUPID_HXX
#include <sal/types.h>
#include <functional>
// !! If you add a new group, please change sfxbasecontroller.cxx and
// !! com.sun.star.frame.CommandGroup accordingly!
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index eaa93af..1658f6d 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/vclptr.hxx>
#include <svl/poolitem.hxx>
#include <sot/formats.hxx>
#include <sot/object.hxx>
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 562b1e9..b2c4ee7 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_SVTOOLS_CALENDAR_HXX
#include <svtools/svtdllapi.h>
#include <unotools/calendarwrapper.hxx>
#include <vcl/calendar.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/field.hxx>
#include <memory>
#include <set>
class MouseEvent;
class TrackingEvent;
diff --git a/include/svtools/langhelp.hxx b/include/svtools/langhelp.hxx
index e3f914c..248c559 100644
--- a/include/svtools/langhelp.hxx
+++ b/include/svtools/langhelp.hxx
@@ -12,6 +12,8 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
/** Localize a URI to one of the foundation's webservices
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 4d75ce0..5ea91fe 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SVTOOLS_PRNSETUP_HXX
#include <svtools/svtdllapi.h>
#include <vcl/print.hxx>
#include <vcl/weld.hxx>
#include <vcl/timer.hxx>
diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h
index 15061a8..754408d 100644
--- a/include/svtools/rtftoken.h
+++ b/include/svtools/rtftoken.h
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SVTOOLS_RTFTOKEN_H
#define INCLUDED_SVTOOLS_RTFTOKEN_H
#include <rtl/ustring.hxx>
namespace rtl {
class OUString;
};
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index dad32aa..44778f6 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -24,7 +24,6 @@
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <unotools/collatorwrapper.hxx>
#include <vcl/commandevent.hxx>
class SvSimpleTable;
class SVT_DLLPUBLIC SvSimpleTableContainer : public Control
diff --git a/include/vcl/BitmapColor.hxx b/include/vcl/BitmapColor.hxx
index f6e1751..0ae0370 100644
--- a/include/vcl/BitmapColor.hxx
+++ b/include/vcl/BitmapColor.hxx
@@ -22,7 +22,6 @@
#include <vcl/dllapi.h>
#include <tools/color.hxx>
#include <memory>
class VCL_DLLPUBLIC BitmapColor final : public Color
{
diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx
index 841c9d6..532242f 100644
--- a/include/vcl/IContext.hxx
+++ b/include/vcl/IContext.hxx
@@ -13,6 +13,8 @@
#include <vcl/EnumContext.hxx>
#include <vector>
#include <algorithm>
namespace vcl
{
diff --git a/include/vcl/IPrioritable.hxx b/include/vcl/IPrioritable.hxx
index 29b2fd7..55faf64 100644
--- a/include/vcl/IPrioritable.hxx
+++ b/include/vcl/IPrioritable.hxx
@@ -10,6 +10,8 @@
#ifndef INCLUDED_VCL_IPRIORITABLE_HXX
#define INCLUDED_VCL_IPRIORITABLE_HXX
#include <vcl/dllapi.h>
#define VCL_PRIORITY_DEFAULT -1
namespace vcl
diff --git a/include/vcl/Scanline.hxx b/include/vcl/Scanline.hxx
index d855f78..4c68efe4 100644
--- a/include/vcl/Scanline.hxx
+++ b/include/vcl/Scanline.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SCANLINE_HXX
#define INCLUDED_VCL_SCANLINE_HXX
#include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx>
typedef sal_uInt8* Scanline;
diff --git a/include/vcl/aboutdialog.hxx b/include/vcl/aboutdialog.hxx
index 8a620a0..02cc2e7 100644
--- a/include/vcl/aboutdialog.hxx
+++ b/include/vcl/aboutdialog.hxx
@@ -10,7 +10,6 @@
#ifndef INCLUDED_VCL_ABOUT_DIALOG_HXX
#define INCLUDED_VCL_ABOUT_DIALOG_HXX
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/fixedhyper.hxx>
#include <vcl/dialog.hxx>
diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx
index 8dd9a02..ae8aaab 100644
--- a/include/vcl/animate/AnimationBitmap.hxx
+++ b/include/vcl/animate/AnimationBitmap.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
#include <vcl/dllapi.h>
#include <vcl/timer.hxx>
#include <vcl/bitmapex.hxx>
enum class Disposal
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index ccdcf3a..042cef0 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_MSGBOX_HXX
#include <vcl/dllapi.h>
#include <vcl/image.hxx>
VCL_DLLPUBLIC Image const & GetStandardInfoBoxImage();
VCL_DLLPUBLIC OUString GetStandardInfoBoxText();
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index 9c4c573..234b5e4 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <map>
#include <unordered_map>
#include <utility>
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 92ed9e9..cd9fca6 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX
#include <vcl/transfer.hxx>
#include <vcl/vclptr.hxx>
#include <sfx2/objsh.hxx>
#include <svl/lstner.hxx>
