tdf#42949 Fix IWYU warnings in filter/

Also drop inc/gfxtypes.hxx and source/svg/spirit_supplements.hxx
which are unused since commit
3ca7be09834a26fbd1c371deabd7a58111092676
"Replace SVGFilter using SVGIO"

Drop now unneeded pass-through header
source/graphicfilter/icgm/main.hxx too.

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

Change-Id: I8abaf294370c98256815a226168085dd01123f3e
Reviewed-on: https://gerrit.libreoffice.org/84734
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

36 files changed, 38 insertions, 88 deletions

diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index b7e4ac40fe06..e8e3a6f6894b 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -20,11 +20,9 @@
 
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
+#include <vcl/bitmapaccess.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-#include <svl/solar.hrc>
-#include <vcl/fltcall.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include "giflzwc.hxx"
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index 018a45812646..057710c85230 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
 
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/mapmod.hxx>
 
 
 class   GIFImageDataOutputStream;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index e933763c9140..dedcbddb0ede 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -28,15 +28,11 @@
 #include <vcl/graph.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/region.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/font.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/settings.hxx>
 #include <unotools/configmgr.hxx>
-#include <svl/solar.hrc>
-#include <vcl/fltcall.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/weld.hxx>
@@ -44,7 +40,6 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
-#include <math.h>
 #include <memory>
 
 using namespace ::com::sun::star::uno;
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 456088d0c234..aaccd16bf73a 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -21,10 +21,7 @@
 #include <tools/stream.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <svl/solar.hrc>
-#include <vcl/fltcall.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index dd72bd297dbd..c892f5db9b68 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -47,9 +47,9 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/helpers.hxx>
 #include <unotools/configmgr.hxx>
-#include <vcl/gradient.hxx>
 
-#include "main.hxx"
+#include "bitmap.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 
 using namespace ::com::sun::star;
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index 825c90243e0a..e6e4d60da426 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -18,12 +18,14 @@
  */
 
 
-#include "main.hxx"
 #include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <memory>
 
+#include "bitmap.hxx"
+#include "elements.hxx"
+
 namespace {
 
 Color BMCOL(sal_uInt32 _col) {
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index 2bb36999de98..357901ad1048 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -20,8 +20,8 @@
 
 #include "bundles.hxx"
 
-#include <tools/stream.hxx>
 #include <memory>
+#include <string.h>
 
 void Bundle::SetColor( sal_uInt32 nColor )
 {
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 32f9fca0257b..09abcac8d136 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -20,11 +20,9 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
 #include <osl/endian.h>
-#include <vcl/virdev.hxx>
-#include <vcl/graph.hxx>
 #include <tools/stream.hxx>
+#include "bitmap.hxx"
 #include "chart.hxx"
-#include "main.hxx"
 #include "elements.hxx"
 #include "outact.hxx"
 #include <memory>
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 19773b9117c1..3f9c88dde649 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -22,10 +22,8 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <rtl/ustring.hxx>
 #include <vector>
 #include <memory>
-#include <vcl/vclptr.hxx>
 #include "cgmtypes.hxx"
 
 class   Graphic;
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx
index a2a3ea34b050..91818149a51a 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "main.hxx"
 #include "chart.hxx"
 
 
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index 839be2e4a196..96b715b9a879 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -20,6 +20,11 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX
 
+#include <sal/types.h>
+
+#include <memory>
+#include <vector>
+
 /* FILE TYPE CONSTANTS: */
 #define BULCHART        32      /* Bullet chart file.       */
 /* the following were added although SPC doesn't have a #define */
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index baeef1249dd7..aa6152d241d0 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "main.hxx"
+#include "bitmap.hxx"
+#include "cgm.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 
 
diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx
index 0adee25234f9..cf9e7ed9885f 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "main.hxx"
+#include "bundles.hxx"
+#include "cgm.hxx"
+#include "elements.hxx"
 
 
 void CGM::ImplDoClass1()
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx
index 05528fe280d8..8d410e475816 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "main.hxx"
+#include "cgm.hxx"
+#include "bundles.hxx"
+#include "elements.hxx"
 
 
 void CGM::ImplDoClass2()
diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx
index 1ccc038d3c56..c3d56367947b 100644
--- a/filter/source/graphicfilter/icgm/class3.cxx
+++ b/filter/source/graphicfilter/icgm/class3.cxx
@@ -18,7 +18,8 @@
  */
 
 
-#include "main.hxx"
+#include "cgm.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 
 
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index a7779ab23d49..0213e89542e3 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -18,8 +18,10 @@
  */
 
 
-#include "main.hxx"
+#include "bitmap.hxx"
+#include "cgm.hxx"
 #include "chart.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 #include <math.h>
 #include <memory>
diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx
index 2525e88b07b1..33273adb7cf8 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -19,7 +19,8 @@
 
 //#define VCL_NEED_BASETSD
 
-#include "main.hxx"
+#include "cgm.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 
 
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx
index 8c2478a308ae..830b4d79c9cd 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "main.hxx"
+#include "cgm.hxx"
 #include "chart.hxx"
 #include "outact.hxx"
 
diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx
index ce2e7de485fd..ea1fc79196a9 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -18,7 +18,8 @@
  */
 
 
-#include "main.hxx"
+#include "cgm.hxx"
+#include "elements.hxx"
 #include "outact.hxx"
 
 
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index 8061d399537a..2be08c32f04b 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -20,6 +20,7 @@
 
 #include "elements.hxx"
 
+#include <algorithm>
 
 CGMElements::CGMElements()
 {
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index e7f0e9ca64d0..4dbd0e9aa08e 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX
 
-#include "main.hxx"
+#include "bundles.hxx"
 #include "cgmtypes.hxx"
 #include <vector>
 #include <map>
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
deleted file mode 100644
index 3d02d5b1f68d..000000000000
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX
-#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX
-
-#include "cgm.hxx"
-
-#include <tools/stream.hxx>
-#include "bundles.hxx"
-#include "bitmap.hxx"
-#include "elements.hxx"
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index a31d42c4560a..43af85d10844 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -32,7 +32,6 @@
 #define CGM_OUTACT_MAX_GROUP_LEVEL 64
 
 #include "cgm.hxx"
-#include "chart.hxx"
 #include <tools/poly.hxx>
 #include <array>
 #include <memory>
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index c57ad6b97924..3c8ce673547a 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <string.h>
 #include <unotools/configmgr.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index e510c3e16789..27ec1fbda76a 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -23,6 +23,8 @@
 #include "dxfreprd.hxx"
 #include <vcl/font.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/virdev.hxx>
 
 enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
 
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
index ce47e205515c..9597fdca95a4 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <string.h>
 #include "dxfblkrd.hxx"
 
 
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index a35cea0fb240..dfc14ba0edcb 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <string.h>
 #include "dxfentrd.hxx"
 
 //--------------------------DXFBasicEntity--------------------------------------
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 1261f29823b0..5d28a1b04c5e 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>
 #include <stdlib.h>
 #include <rtl/strbuf.hxx>
 #include <tools/stream.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 424aa2ac728e..26ec1077ae79 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <string.h>
 #include "dxfreprd.hxx"
 #include <osl/nlsupport.h>
 #include <officecfg/Setup.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.cxx b/filter/source/graphicfilter/idxf/dxftblrd.cxx
index 3975651ac0ea..e328c797a0f1 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <string.h>
 #include "dxftblrd.hxx"
 
 //----------------------------------DXFLType-----------------------------------
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index 80abdd8a8470..ad75d6b5e1c3 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -18,12 +18,9 @@
  */
 
 
-#include <string.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/virdev.hxx>
 #include "dxf2mtf.hxx"
-#include <math.h>
 
 class FilterConfigItem;
 
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index b8942d13e48c..4ad7349149e3 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -20,10 +20,7 @@
 
 #include <tools/solar.h>
 #include <vcl/svapp.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/animate/Animation.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/window.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 00ef5a9355b6..85e8b269423d 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -30,7 +30,6 @@
 #include <vcl/gdimtf.hxx>
 
 #include <math.h>
-#include <algorithm>
 #include <memory>
 
 class FilterConfigItem;
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 9c9fc0983f30..6da5f9c50f02 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -18,12 +18,8 @@
  */
 
 
-#include <rtl/alloc.h>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/fltcall.hxx>
-#include <svl/solar.hrc>
 #include <vcl/FilterConfigItem.hxx>
 #include <tools/stream.hxx>
 
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index d81cc2d7b073..bfd06303f3a1 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include <sal/config.h>
 #include <sal/log.hxx>
 
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index 88beb13d9b6f..f231ecd8ec6a 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -21,8 +21,6 @@
 #include "lzwdecom.hxx"
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
-#include <algorithm>
-#include <set>
 
 LZWDecompressor::LZWDecompressor()
     : pIStream(nullptr)