tdf#146619 Recheck svx/ with IWYU

Change-Id: I99650b50587294c20b1e92270e541140d9ec9cae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161240 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-10-02 01:11:21 +02:00 · 2023-10-02 01:11:21 +02:00 · ebae130b09
commit ebae130b09
parent 819630ee52
87 changed files with 31 additions and 121 deletions
--- a/svx/IwyuFilter_svx.yaml
+++ b/svx/IwyuFilter_svx.yaml
@ -1,6 +1,12 @@
 ---
 assumeFilename: svx/source/svdraw/svdobj.cxx
 excludelist:
+    svx/inc/getallcharpropids.hxx:
+    # Actually used
+    - o3tl/span.hxx
+    svx/source/accessibility/AccessibleTextEventQueue.hxx:
+    # Needed for std::for_each
+    - algorithm
    svx/source/accessibility/ChildrenManagerImpl.cxx:
    # Actually used
    - com/sun/star/beans/XPropertySet.hpp
@ -10,6 +16,12 @@ excludelist:
    svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:
    # Boost wrapper is needed
    - boost/spirit/include/classic_core.hpp
+    svx/source/customshapes/EnhancedCustomShapeEngine.cxx:
+    # Needed for SvxShape
+    - svx/unoshape.hxx
+    svx/source/engine3d/float3d.cxx:
+    # Needed for E3dObject instantiation
+    - svx/obj3d.hxx
    svx/source/dialog/ClassificationCommon.cxx:
    # Actually used
    - com/sun/star/beans/XPropertyContainer.hpp
@ -19,6 +31,9 @@ excludelist:
    svx/source/dialog/srchdlg.cxx:
    # Actually used
    - comphelper/scopeguard.hxx
+    svx/source/form/fmmodel.cxx:
+    # Actually used
+    - com/sun/star/form/XForms.hpp
    svx/source/fmcomp/dbaobjectex.cxx:
    # Actually used
    - com/sun/star/ucb/XContent.hpp
@ -29,9 +44,6 @@ excludelist:
    svx/source/fmcomp/gridcell.cxx:
    # Needed to avoid mysterious linking error on WIN32 no-pch
    - toolkit/helper/listenermultiplexer.hxx
-    svx/source/gallery2/gallerybinaryengine.cxx:
-    # Don't propose hxx -> h change in URE libs
-    - osl/thread.hxx
    svx/source/gallery2/galtheme.cxx:
    # Don't propose hxx -> h change in URE libs
    - osl/thread.hxx
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@ -22,7 +22,6 @@

 #include <svx/def3d.hxx>
 #include <svx/svddrgmt.hxx>
-#include <svx/view3d.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>

--- a/svx/inc/galleryfilestorage.hxx
+++ b/svx/inc/galleryfilestorage.hxx
@ -23,7 +23,6 @@
 #include <svx/svxdllapi.h>
 #include <svx/fmmodel.hxx>
 #include "gallerystoragelocations.hxx"
-#include "galleryfilestorage.hxx"
 #include <tools/urlobj.hxx>
 #include <sot/storage.hxx>
 #include <vcl/salctype.hxx>
--- a/svx/inc/galleryfilestorageentry.hxx
+++ b/svx/inc/galleryfilestorageentry.hxx
@ -23,7 +23,6 @@
 #include <svx/galtheme.hxx>
 #include "galleryfilestorage.hxx"
 #include "gallerystoragelocations.hxx"
-#include "galleryfilestorageentry.hxx"

 class GalleryObjectCollection;

--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@ -27,7 +27,6 @@
 #include <editeng/outlobj.hxx>
 #include <tools/color.hxx>
 #include <sdr/attribute/sdrformtextattribute.hxx>
-#include <tools/weakbase.h>
 #include <svx/sdtaitm.hxx>
 #include <rtl/ref.hxx>
 #include <unotools/weakref.hxx>
--- a/svx/inc/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@ -22,8 +22,6 @@

 #include <sal/config.h>

-#include <optional>
-
 #include <svx/sdr/properties/properties.hxx>
 #include <svl/itemset.hxx>

--- a/svx/inc/shapecollection.hxx
+++ b/svx/inc/shapecollection.hxx
@ -22,7 +22,6 @@
 #include <comphelper/interfacecontainer4.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <mutex>
 #include <vector>
--- a/svx/inc/tbxcolorupdate.hxx
+++ b/svx/inc/tbxcolorupdate.hxx
@ -19,6 +19,7 @@

 #pragma once

+#include <sfx2/namedcolor.hxx>
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <vcl/vclenum.hxx>
@ -26,7 +27,6 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/toolboxid.hxx>
 #include <svl/lstner.hxx>
-#include <svx/Palette.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
--- a/svx/qa/unit/ThemeTest.cxx
+++ b/svx/qa/unit/ThemeTest.cxx
@ -10,9 +10,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-#include <config_features.h>

 #include <docmodel/theme/Theme.hxx>

--- a/svx/qa/unit/classicshapes.cxx
+++ b/svx/qa/unit/classicshapes.cxx
@ -17,7 +17,6 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/frame/Desktop.hpp>

 using namespace ::com::sun::star;

--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@ -16,7 +16,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <comphelper/propertyvalue.hxx>
 #include <editeng/unoprnms.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@ -29,7 +28,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svxids.hrc>
-#include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/BitmapReadAccess.hxx>
@ -40,11 +38,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
-#include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>

 using namespace ::com::sun::star;

--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@ -38,7 +38,6 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/textdata.hxx>
-#include <vcl/unohelp.hxx>


 // Project-local header
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@ -39,7 +39,6 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <comphelper/lok.hxx>
-#include <comphelper/types.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_CHILDRENMANAGERIMPL_HXX
 #define INCLUDED_SVX_SOURCE_ACCESSIBILITY_CHILDRENMANAGERIMPL_HXX

+#include <svx/AccessibleShape.hxx>
 #include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/IAccessibleParent.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
@ -35,8 +36,6 @@

 namespace accessibility {

-class AccessibleShape;
-
 class ChildDescriptor; // See below for declaration.
 typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;

--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@ -30,7 +30,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <comphelper/accessiblecontexthelper.hxx>
-#include <comphelper/types.hxx>

 namespace svx
 {
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@ -52,7 +52,6 @@
 #include <sal/log.hxx>
 #include <rtl/math.hxx>
 #include <comphelper/configuration.hxx>
-#include <comphelper/string.hxx>

 using namespace com::sun::star;
 using namespace com::sun::star::uno;
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@ -27,7 +27,6 @@
 #include <vcl/customweld.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
-#include <sfx2/objsh.hxx>

 #include <officecfg/Office/Common.hxx>

--- a/svx/source/dialog/ThemeColorEditDialog.cxx
+++ b/svx/source/dialog/ThemeColorEditDialog.cxx
@ -8,7 +8,6 @@
 */

 #include <svx/dialog/ThemeColorEditDialog.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/colorbox.hxx>

 namespace svx
--- a/svx/source/dialog/ThemeColorValueSet.cxx
+++ b/svx/source/dialog/ThemeColorValueSet.cxx
@ -8,7 +8,6 @@
 */

 #include <svx/dialog/ThemeColorValueSet.hxx>
-#include <docmodel/uno/UnoComplexColor.hxx>
 #include <vcl/event.hxx>

 namespace svx
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@ -12,7 +12,6 @@
 #include <docmodel/theme/Theme.hxx>
 #include <svx/ColorSets.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/colorbox.hxx>
 #include <comphelper/lok.hxx>

 namespace svx
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@ -25,7 +25,6 @@
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
-#include <o3tl/safeint.hxx>
 #include <svtools/imagemgr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <tools/urlobj.hxx>
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@ -27,7 +27,6 @@
 #include <com/sun/star/i18n/ScriptType.hpp>

 #include <vector>
-#include <deque>
 #include <optional>
 #include <svtools/colorcfg.hxx>
 #include <svtools/sampletext.hxx>
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@ -21,7 +21,6 @@

 #include <math.h>
 #include <vector>
-#include <set>
 #include <unordered_set>
 #include <algorithm>
 #include <o3tl/hash_combine.hxx>
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@ -20,8 +20,6 @@
 #include <config_wasm_strip.h>

 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>

 #include <svx/ucsubset.hxx>
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@ -71,8 +71,6 @@
 #include <cstdlib>
 #include <memory>

-#include <findtextfield.hxx>
-
 #include <svx/labelitemwindow.hxx>
 #include <svx/xdef.hxx>
 #include <officecfg/Office/Common.hxx>
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@ -25,7 +25,6 @@
 #if HAVE_FEATURE_DBCONNECTIVITY
 #include <dbcharsethelper.hxx>
 #endif
-#include <unotools/syslocale.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 #include <txenctab.hrc>
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@ -33,6 +33,7 @@
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
+#include <svx/view3d.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <comphelper/lok.hxx>

--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@ -70,7 +70,6 @@
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <memory>
-#include <string_view>

 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::view;
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@ -63,7 +63,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/container/XContainer.hpp>

 #include <comphelper/namedvaluecollection.hxx>
--- a/svx/source/gallery2/galleryfilestorage.cxx
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@ -24,7 +24,6 @@
 #include <galleryfilestorage.hxx>
 #include <svx/galleryobjectcollection.hxx>
 #include <svx/gallery1.hxx>
-#include <osl/thread.hxx>
 #include "codec.hxx"
 #include "gallerydrawmodel.hxx"
 #include <vcl/cvtgrf.hxx>
--- a/svx/source/inc/StylesPreviewToolBoxControl.hxx
+++ b/svx/source/inc/StylesPreviewToolBoxControl.hxx
@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "StylesPreviewWindow.hxx"
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>

 class StylesPreviewToolBoxControl final
    : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo>
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@ -20,7 +20,6 @@
 #include <sal/config.h>

 #include <o3tl/any.hxx>
-#include <comphelper/anycompare.hxx>
 #include <comphelper/anytohash.hxx>
 #include <svx/sdasitm.hxx>

--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@ -21,7 +21,7 @@
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/bgradient.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
 #include <vcl/graph.hxx>
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@ -46,7 +46,6 @@
 #include <editeng/colritem.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
-#include <toolkit/helper/vclunohelper.hxx>

 #include <bitmaps.hlst>

--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@ -23,7 +23,6 @@
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive2d/sdrcustomshapeprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svx/obj3d.hxx>
 #include <vcl/canvastools.hxx>


--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@ -26,7 +26,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <osl/diagnose.h>
-#include <unotools/configmgr.hxx>
 #include <vcl/canvastools.hxx>

 namespace sdr::contact
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@ -29,7 +29,6 @@
 #include <svx/sdrpagewindow.hxx>

 #include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@ -28,7 +28,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
-#include <svtools/optionsdrawinglayer.hxx>
 #include <osl/diagnose.h>
 #include <memory>

--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@ -24,7 +24,6 @@
 #include <vcl/window.hxx>
 #include <tools/fract.hxx>
 #include <vcl/cursor.hxx>
-#include <svtools/optionsdrawinglayer.hxx>


 namespace sdr::overlay
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@ -27,14 +27,12 @@
 #include <drawinglayer/primitive2d/PolygonMarkerPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
-#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>


 namespace drawinglayer::primitive2d
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@ -62,7 +62,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/GraphicLoader.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/utils/gradienttools.hxx>
 #include <svx/svx3ditems.hxx>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@ -26,7 +26,6 @@
 #include <svl/whiter.hxx>
 #include <svl/poolitem.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svddef.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlnstit.hxx>
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@ -25,8 +25,6 @@
 #include <svl/whiter.hxx>
 #include <vector>
 #include <svx/svdobj.hxx>
-#include <svx/svddef.hxx>
-#include <editeng/eeitem.hxx>
 #include <libxml/xmlwriter.h>
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <osl/diagnose.h>
 #include <svx/sidebar/AreaPropertyPanelBase.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/itemwin.hxx>
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@ -24,8 +24,6 @@

 #include <svx/sidebar/InspectorTextPanel.hxx>

-#include <svl/cjkoptions.hxx>
-#include <svl/ctloptions.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <inspectorvalues.hrc>
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@ -28,7 +28,6 @@
 #include <svtools/unitconv.hxx>

 #include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>

 #include <ParaLineSpacingPopup.hxx>
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@ -19,7 +19,6 @@
 #include <svx/sidebar/ValueSetWithTextControl.hxx>
 #include <sfx2/sidebar/Theme.hxx>

-#include <i18nlangtag/mslangid.hxx>
 #include <svtools/valueset.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@ -11,7 +11,6 @@
 #include <svx/ColorSets.hxx>

 #include <optional>
-#include <utility>
 #include <unordered_set>
 #include <docmodel/theme/ColorSet.hxx>

--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@ -8,7 +8,6 @@
 *
 */

-#include <memory>
 #include <CommonStylePreviewRenderer.hxx>

 #include <sfx2/objsh.hxx>
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@ -20,7 +20,6 @@
 #include <svx/charthelper.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XUpdatable2.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@ -23,7 +23,7 @@
 // re-creating the connections for contained connectors
 #include <clonelist.hxx>
 #include <svx/svdoedge.hxx>
-#include <svx/scene3d.hxx>
+#include <svx/svdpage.hxx>

 void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone)
 {
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@ -30,7 +30,6 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svddrgm1.hxx"
-#include <svx/obj3d.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@ -33,7 +33,6 @@
 #include <svx/svdview.hxx>
 #include <clonelist.hxx>
 #include <svx/svdogrp.hxx>
-#include <svx/scene3d.hxx>
 #include <svx/xfillit0.hxx>
 #include <osl/diagnose.h>

--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@ -34,7 +34,6 @@

 #include <AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
-#include <svx/obj3d.hxx>
 #include <svx/rectenum.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdooitm.hxx>
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@ -21,7 +21,9 @@

 #include <algorithm>

+#if defined _WIN32 && !defined _WIN64
 #include <officecfg/Office/Common.hxx>
+#endif
 #include <svtools/colorcfg.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdedxv.hxx>
@ -38,7 +40,7 @@
 #include <svx/xflgrit.hxx>
 #include <svx/svdoole2.hxx>
 #include <svl/itempool.hxx>
-#include <unotools/configmgr.hxx>
+#include <comphelper/configuration.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <svx/xflbckit.hxx>
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@ -28,11 +28,10 @@
 #include <svx/dialmgr.hxx>


-#include <svx/obj3d.hxx>
-#include <svx/scene3d.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svx/svdoedge.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>

 #include <cassert>

--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@ -19,7 +19,6 @@

 #include <svx/svdmodel.hxx>
 #include <cassert>
-#include <math.h>
 #include <sal/log.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@ -25,7 +25,7 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlnwtit.hxx>
-#include <sdr/properties/attributeproperties.hxx>
+#include <svx/sdr/properties/properties.hxx>

 using namespace com::sun::star;

--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@ -21,9 +21,7 @@
 #include <config_features.h>

 #include <sal/config.h>
-#include <sal/log.hxx>

-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@ -44,7 +42,6 @@
 #include <math.h>
 #include <svl/grabbagitem.hxx>
 #include <tools/bigint.hxx>
-#include <comphelper/diagnose_ex.hxx>
 #include <tools/helpers.hxx>
 #include <comphelper/configuration.hxx>
 #include <vcl/canvastools.hxx>
@ -113,8 +110,6 @@
 #include <svdobjplusdata.hxx>
 #include <svdobjuserdatalist.hxx>

-#include <unordered_set>
-
 #include <optional>
 #include <libxml/xmlwriter.h>
 #include <memory>
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@ -29,10 +29,6 @@
 #include <ucbhelper/content.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
-#include <boost/property_tree/json_parser.hpp>

 #include <vcl/svapp.hxx>

--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@ -43,7 +43,6 @@
 #include <svx/sdtfsitm.hxx>
 #include <svx/sdtmfitm.hxx>
 #include <svx/xtextit0.hxx>
-#include <svx/compatflags.hxx>
 #include <sdr/properties/textproperties.hxx>
 #include <sdr/contact/viewcontactoftextobj.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@ -23,7 +23,6 @@
 #include <unordered_set>

 #include <svx/svdpage.hxx>
-#include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>

 #include <o3tl/safeint.hxx>
@ -31,7 +30,6 @@

 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
-#include <comphelper/lok.hxx>

 #include <svtools/colorcfg.hxx>
 #include <svx/svdetc.hxx>
@ -45,7 +43,6 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/ColorSets.hxx>

 #include <sdr/contact/viewcontactofsdrpage.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@ -23,7 +23,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/vectorgraphicdata.hxx>

-#include <math.h>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/wghtitem.hxx>
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@ -19,7 +19,6 @@


 #include <svx/svdsnpv.hxx>
-#include <math.h>

 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@ -30,7 +30,6 @@
 #include <svx/xfillit0.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/scene3d.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdogrp.hxx>
 #include <sdr/properties/itemsettools.hxx>
@ -41,13 +40,13 @@
 #include <svx/svdviter.hxx>
 #include <svx/svdotable.hxx> // #i124389#
 #include <utility>
-#include <vcl/svapp.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svx/svdoashp.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <svx/diagram/datamodel.hxx>
 #include <svx/diagram/IDiagramHelper.hxx>
+#include <tools/debug.hxx>


 // iterates over all views and unmarks this SdrObject if it is marked
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@ -34,7 +34,6 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdview.hxx>
 #include <editeng/flditem.hxx>
-#include <svx/obj3d.hxx>
 #include <svx/svddrgmt.hxx>
 #include <svx/svdotable.hxx>
 #include <tools/debug.hxx>
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@ -24,7 +24,6 @@
 #include <tablemodel.hxx>
 #include "tablecolumn.hxx"
 #include "tableundo.hxx"
-#include <sdr/properties/cellproperties.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdotable.hxx>
 #include <utility>
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@ -39,7 +39,6 @@
 #include "tablecolumns.hxx"
 #include "tableundo.hxx"
 #include <o3tl/safeint.hxx>
-#include <sdr/properties/cellproperties.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/strings.hrc>
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@ -24,7 +24,6 @@
 #include <cell.hxx>
 #include "tablerow.hxx"
 #include "tableundo.hxx"
-#include <sdr/properties/cellproperties.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdotable.hxx>
 #include <utility>
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@ -19,7 +19,6 @@

 #include <svx/PaletteManager.hxx>

-#include <basegfx/color/bcolortools.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
@ -42,8 +41,6 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <docmodel/color/ComplexColor.hxx>
 #include <docmodel/color/ComplexColorJSON.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/memberids.h>

 #include <palettes.hxx>

--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@ -39,7 +39,6 @@
 #include <editeng/colritem.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlnclit.hxx>
-#include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <helpids.h>
 #include <vcl/virdev.hxx>
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@ -22,7 +22,6 @@
 #include <comphelper/propertyvalue.hxx>
 #include <o3tl/string_view.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/idle.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@ -29,7 +29,6 @@
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <svtools/colorcfg.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@ -39,7 +39,6 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <tools/json_writer.hxx>
 #include <vcl/toolbox.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>

 #include <memory>
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@ -19,6 +19,7 @@

 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/namedcolor.hxx>
 #include <svx/drawitem.hxx>
 #include <tbxcolorupdate.hxx>
 #include <svx/svxids.hrc>
--- a/svx/source/theme/ThemeColorChangerCommon.cxx
+++ b/svx/source/theme/ThemeColorChangerCommon.cxx
@ -11,16 +11,8 @@

 #include <sal/config.h>
 #include <editeng/colritem.hxx>
-#include <editeng/unoprnms.hxx>
-#include <docmodel/uno/UnoComplexColor.hxx>
 #include <docmodel/theme/ColorSet.hxx>

-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XComplexColor.hpp>
-
 #include <svx/xlnclit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xdef.hxx>
--- a/svx/source/theme/ThemeColorPaletteManager.cxx
+++ b/svx/source/theme/ThemeColorPaletteManager.cxx
@ -11,7 +11,6 @@

 #include <basegfx/color/bcolortools.hxx>
 #include <tools/color.hxx>
-#include <unotools/resmgr.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <docmodel/theme/ColorSet.hxx>
--- a/svx/source/unodraw/SvxXTextColumns.cxx
+++ b/svx/source/unodraw/SvxXTextColumns.cxx
@ -35,7 +35,6 @@
 #include <o3tl/safeint.hxx>
 #include <svl/itemprop.hxx>
 #include <svx/SvxXTextColumns.hxx>
-#include <tools/UnitConversion.hxx>
 #include <vcl/svapp.hxx>

 #include <numeric>
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@ -25,7 +25,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>

 #include <cppuhelper/implbase.hxx>
-#include <tools/weakbase.hxx>
 #include <unotools/weakref.hxx>

 #include <svx/svdobj.hxx>
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@ -22,7 +22,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/unoevent.hxx>
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@ -23,7 +23,6 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/form/XForms.hpp>
 #include <o3tl/safeint.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/classids.hxx>
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@ -22,11 +22,11 @@

 #include <comphelper/propertysetinfo.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <editeng/unoipset.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/unopool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/unoprov.hxx>
 #include <svx/unoshprp.hxx>
 #include <svx/xflbstit.hxx>
 #include <svx/xflbmtit.hxx>
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@ -34,7 +34,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <tools/fldunit.hxx>
-#include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
 #include <svx/dialmgr.hxx>
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@ -29,7 +29,6 @@
 #include <editeng/unotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
-#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/multiinterfacecontainer4.hxx>
@ -39,6 +38,7 @@
 #include <svx/sdangitm.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdopage.hxx>
+#include <svx/svx3ditems.hxx>
 #include <svx/xflbstit.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/xlnstit.hxx>
@ -78,8 +78,6 @@
 #include "shapeimpl.hxx"
 #include <sal/log.hxx>

-#include <svx/lathe3d.hxx>
-#include <extrud3d.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <drawinglayer/converters.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@ -19,6 +19,7 @@

 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>

 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@ -90,7 +90,7 @@
 #include <unotools/syslocale.hxx>
 #include <string>

-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 #include <libxml/xmlwriter.h>

 using namespace ::com::sun::star;
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@ -35,7 +35,6 @@
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/utils/gradienttools.hxx>
 #include <memory>

 using namespace com::sun::star;