From 840b4eb2f3443ff883016e6a8a8ae49e9cbd9e4e Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Fri, 31 Dec 2021 16:52:16 +0100
Subject: Recheck modules [a-c]* with IWYU

See tdf#42949 for motivation

Change-Id: I74a3c3a67c3639376e2251c3eb917fa4139dfbd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127808
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 canvas/IwyuFilter_canvas.yaml                      | 3 +++
 canvas/qa/cppunit/canvastest.cxx                   | 2 --
 canvas/source/cairo/cairo_canvas.cxx               | 1 -
 canvas/source/cairo/cairo_textlayout.cxx           | 1 -
 canvas/source/directx/dx_textlayout_drawhelper.cxx | 1 +
 canvas/source/directx/dx_textlayout_drawhelper.hxx | 3 ++-
 canvas/source/directx/dx_vcltools.hxx              | 3 ++-
 canvas/source/factory/cf_service.cxx               | 1 -
 canvas/source/vcl/canvas.cxx                       | 1 -
 canvas/source/vcl/outdevholder.hxx                 | 1 -
 canvas/source/vcl/spritehelper.cxx                 | 4 ----
 canvas/source/vcl/textlayout.cxx                   | 1 -
 12 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'canvas')

diff --git a/canvas/IwyuFilter_canvas.yaml b/canvas/IwyuFilter_canvas.yaml
index 0ec833918e92..74419ea56103 100644
--- a/canvas/IwyuFilter_canvas.yaml
+++ b/canvas/IwyuFilter_canvas.yaml
@@ -17,6 +17,9 @@ excludelist:
     - com/sun/star/awt/XTopWindow.hpp
     # Complete type needed for return type
     - basegfx/range/b2irange.hxx
+    canvas/source/opengl/ogl_canvascustomsprite.cxx:
+    # Complete type needed for B2DPolyPolygon return type
+    - basegfx/polygon/b2dpolypolygon.hxx
     canvas/source/cairo/cairo_spritecanvashelper.cxx:
     # Needed for boost/polymorphic_cast.hpp
     - boost/cast.hpp
diff --git a/canvas/qa/cppunit/canvastest.cxx b/canvas/qa/cppunit/canvastest.cxx
index 5414a757d3c3..7927f07c0723 100644
--- a/canvas/qa/cppunit/canvastest.cxx
+++ b/canvas/qa/cppunit/canvastest.cxx
@@ -16,9 +16,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>
 
-#include <com/sun/star/rendering/XBitmap.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 #include <com/sun/star/rendering/PathJoinType.hpp>
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 5b727905673a..622213deeeb1 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -26,7 +26,6 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/sysdata.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
-#include <vcl/window.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include "cairo_canvas.hxx"
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index fd116745e7a8..4a0236f6bf4b 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -21,7 +21,6 @@
 #include <sal/log.hxx>
 
 #include <math.h>
-#include <memory>
 
 #include <com/sun/star/rendering/TextDirection.hpp>
 #include <canvas/canvastools.hxx>
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index cd50cb4878ed..20ff8bd441c9 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/rendering/FontRequest.hpp>
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index d5820451fb53..0db8fca69762 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -26,8 +26,9 @@
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <com/sun/star/geometry/Matrix2D.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
 namespace com::sun::star::rendering { class XCanvasFont; }
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index a54ec3b90bd3..433afa618eb7 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -20,8 +20,9 @@
 #pragma once
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/util/TriState.hpp>
+#include <com/sun/star/rendering/XBitmap.hpp>
 #include <memory>
+#include <vector>
 
 namespace Gdiplus { class Graphics; }
 
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 6cb27699864c..3323b8675a15 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -36,7 +36,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <o3tl/functional.hxx>
-#include <config_features.h>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <unotools/configmgr.hxx>
 
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 2ad0a61fc9fd..e9ebf85b3b3a 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -25,7 +25,6 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include "outdevholder.hxx"
 
diff --git a/canvas/source/vcl/outdevholder.hxx b/canvas/source/vcl/outdevholder.hxx
index 78f3badf8bb6..9679687c4329 100644
--- a/canvas/source/vcl/outdevholder.hxx
+++ b/canvas/source/vcl/outdevholder.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <vcl/outdev.hxx>
 
 #include "outdevprovider.hxx"
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 01ed44b9be98..8e8d88ac30af 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -31,13 +31,9 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
-#include <vcl/skia/SkiaHelper.hxx>
 
 #include <canvas/canvastools.hxx>
-#include <config_features.h>
 
-#include "impltools.hxx"
 #include "spritehelper.hxx"
 
 using namespace ::com::sun::star;
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index efc772228390..48c291f31c4e 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -21,7 +21,6 @@
 #include <sal/config.h>
 
 #include <tools/diagnose_ex.h>
-#include <tools/long.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/canvastools.hxx>
-- 
cgit