tdf#42949 Fix IWYU warnings in include/svx/[sS][a-h]*

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

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

13 files changed, 30 insertions, 46 deletions

diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx
index cfe472e632a9..c03c9a6808df 100644
--- a/include/cui/cuicharmap.hxx
+++ b/include/cui/cuicharmap.hxx
@@ -26,6 +26,7 @@
 #include <svl/itemset.hxx>
 #include <svx/charmap.hxx>
 #include <svx/searchcharmap.hxx>
+#include <svx/ucsubset.hxx>
 #include <sfx2/charwin.hxx>
 #include <cui/cuidllapi.h>
 
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index e252ae30cc01..b58463879f55 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_SVX_SHAPETYPEHANDLER_HXX
 #define INCLUDED_SVX_SHAPETYPEHANDLER_HXX
 
-#include <svx/AccessibleShapeTreeInfo.hxx>
-#include <svx/AccessibleShapeInfo.hxx>
-#include <svx/AccessibleShape.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <svx/svxdllapi.h>
 
+#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <unordered_map>
 #include <vector>
 
+namespace accessibility { class AccessibleShape; }
+namespace accessibility { class AccessibleShapeInfo; }
+namespace accessibility { class AccessibleShapeTreeInfo; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace accessibility {
 
 /** Use an integer to represent shape type ids.  A ShapeTypeId is unique
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index b3432db5f15c..0f897f7edf40 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -30,11 +30,6 @@
 
 namespace sdr { namespace properties {
     class BaseProperties;
-    class E3dSceneProperties;
-}}
-
-namespace drawinglayer { namespace geometry {
-    class ViewInformation3D;
 }}
 
 /*************************************************************************
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index b4014bdd8807..9b70de0e8e4b 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -23,13 +23,13 @@
 #include <svx/svddef.hxx>
 #include <svx/sdooitm.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
-#include <map>
 #include <unordered_map>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { class Any; }
+
 class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
 {
 public:
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index fd2f23c51a4b..b91ba08ceabe 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -21,11 +21,12 @@
 #define INCLUDED_SVX_SDRHITTESTHELPER_HXX
 
 #include <svx/svxdllapi.h>
-#include <tools/gen.hxx>
 
 
 // #i101872# new Object HitTest as View-tooling
 
+
+class Point;
 class SdrObject;
 class SdrPageView;
 class SdrLayerIDSet;
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index a072ed6ba5aa..072c12cfd8fa 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -24,8 +24,6 @@
 #include <svx/svdsob.hxx>
 #include <memory>
 
-class SdrObject;
-class SfxItemSet;
 class SdrPageProperties;
 
 namespace sdr
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index e43279e31e6c..b95daf0b5afe 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -21,14 +21,14 @@
 #define INCLUDED_SVX_SDRPAGEWINDOW_HXX
 
 #include <basegfx/range/b2irectangle.hxx>
-#include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
-#include <rtl/ref.hxx>
 #include <memory>
 
-#include <com/sun/star/awt/XControlContainer.hpp>
-
+namespace com::sun::star::awt { class XControlContainer; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace rtl { template <class reference_type> class Reference; }
+namespace sdr { namespace overlay { class OverlayManager; } }
 namespace vcl { class Region; }
 
 namespace sdr
@@ -40,7 +40,7 @@ namespace sdr
     }
 }
 
-namespace basegfx { class B2DRange; class B2IRange; }
+namespace basegfx { class B2DRange; }
 
 class SdrPaintWindow;
 class SdrPageView;
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index f932c91eac1c..60a06bd546c5 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_SDRUNDOMANAGER_HXX
 
 #include <svx/svxdllapi.h>
-#include <sal/types.h>
 #include <editeng/editund2.hxx>
 #include <tools/link.hxx>
 
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 53198eb9d856..01543290a786 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SVX_SDTFCHIM_HXX
 
 #include <svl/eitem.hxx>
-#include <svx/svddef.hxx>
+#include <svx/svxdllapi.h>
 
 class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
 {
diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx
index 7cdebe6acf12..f968da5b6cea 100644
--- a/include/svx/searchcharmap.hxx
+++ b/include/svx/searchcharmap.hxx
@@ -19,36 +19,23 @@
 #ifndef INCLUDED_SVX_SEARCHCHARMAP_HXX
 #define INCLUDED_SVX_SEARCHCHARMAP_HXX
 
-#include <map>
 #include <memory>
 
 #include <sal/types.h>
-#include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/charmap.hxx>
-#include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/event.hxx>
 #include <vcl/outdev.hxx>
-#include <svx/ucsubset.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
-#include <vector>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star {
-    namespace accessibility { class XAccessible; }
-} } }
-
-namespace vcl { class Font; }
+namespace svx { struct SvxShowCharSetItem; }
+namespace tools { class Rectangle; }
+namespace weld { class ScrolledWindow; }
 
 #define COLUMN_COUNT    16
 #define ROW_COUNT        8
 
-class CommandEvent;
-class ScrollBar;
+class Subset;
 
 class SVX_DLLPUBLIC SvxSearchCharSet : public SvxShowCharSet
 {
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index 11acdac3cd59..70bdaced27d6 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -30,7 +30,6 @@ namespace vcl { class Window; }
 class SfxItemSet;
 class SfxRequest;
 class SfxStyleSheet;
-class SdrPage;
 class SdrModel;
 class Point;
 class FontList;
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 818ad4bcacca..bd8a8a9377af 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -22,12 +22,15 @@
 
 #include <svx/svxdllapi.h>
 #include <svx/shapeproperty.hxx>
-
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
+#include <rtl/ustring.hxx>
 
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertyChangeListener; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace osl { class Mutex; }
+
 namespace cppu
 {
     class OWeakObject;
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 25a370a5de89..9fda3d3ddb40 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -25,6 +25,7 @@
 #include <vcl/metric.hxx>
 
 #include <list>
+#include <vector>
 
 class FontCharMap;