From ebae130b0978f48af555a1f19f56685d3b3414e8 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 2 Oct 2023 01:11:21 +0200 Subject: [PATCH] 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 --- svx/IwyuFilter_svx.yaml | 18 +++++++++++++++--- svx/inc/dragmt3d.hxx | 1 - svx/inc/galleryfilestorage.hxx | 1 - svx/inc/galleryfilestorageentry.hxx | 1 - svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 1 - svx/inc/sdr/properties/emptyproperties.hxx | 2 -- svx/inc/shapecollection.hxx | 1 - svx/inc/tbxcolorupdate.hxx | 2 +- svx/qa/unit/ThemeTest.cxx | 3 --- svx/qa/unit/classicshapes.cxx | 1 - svx/qa/unit/customshapes.cxx | 5 ----- .../accessibility/AccessibleTextHelper.cxx | 1 - .../accessibility/ChildrenManagerImpl.cxx | 1 - .../accessibility/ChildrenManagerImpl.hxx | 3 +-- svx/source/accessibility/charmapacc.cxx | 1 - .../EnhancedCustomShapeFontWork.cxx | 1 - svx/source/dialog/ClassificationDialog.cxx | 1 - svx/source/dialog/ThemeColorEditDialog.cxx | 1 - svx/source/dialog/ThemeColorValueSet.cxx | 1 - svx/source/dialog/ThemeDialog.cxx | 1 - svx/source/dialog/docrecovery.cxx | 1 - svx/source/dialog/fntctrl.cxx | 1 - svx/source/dialog/framelinkarray.cxx | 1 - svx/source/dialog/searchcharmap.cxx | 2 -- svx/source/dialog/srchdlg.cxx | 2 -- svx/source/dialog/txencbox.cxx | 1 - svx/source/engine3d/dragmt3d.cxx | 1 + svx/source/fmcomp/fmgridcl.cxx | 1 - svx/source/form/fmvwimp.cxx | 1 - svx/source/gallery2/galleryfilestorage.cxx | 1 - svx/source/inc/StylesPreviewToolBoxControl.hxx | 1 - svx/source/items/customshapeitem.cxx | 1 - .../attribute/sdrallfillattributeshelper.cxx | 2 +- .../sdr/contact/viewcontactofgraphic.cxx | 1 - .../contact/viewcontactofsdrobjcustomshape.cxx | 1 - .../sdr/contact/viewcontactofsdrpathobj.cxx | 1 - .../contact/viewobjectcontactofunocontrol.cxx | 1 - svx/source/sdr/overlay/overlaymanager.cxx | 1 - .../sdr/overlay/overlaymanagerbuffered.cxx | 1 - svx/source/sdr/overlay/overlaytools.cxx | 2 -- .../sdr/primitive2d/sdrattributecreator.cxx | 1 - .../sdr/properties/attributeproperties.cxx | 1 - .../sdr/properties/defaultproperties.cxx | 2 -- .../sidebar/area/AreaPropertyPanelBase.cxx | 1 - .../sidebar/inspector/InspectorTextPanel.cxx | 2 -- .../paragraph/ParaLineSpacingControl.cxx | 1 - .../sidebar/tools/ValueSetWithTextControl.cxx | 1 - svx/source/styles/ColorSets.cxx | 1 - .../styles/CommonStylePreviewRenderer.cxx | 1 - svx/source/svdraw/charthelper.cxx | 1 - svx/source/svdraw/clonelist.cxx | 2 +- svx/source/svdraw/svddrgv.cxx | 1 - svx/source/svdraw/svdedtv.cxx | 1 - svx/source/svdraw/svdedtv1.cxx | 1 - svx/source/svdraw/svdetc.cxx | 4 +++- svx/source/svdraw/svdmark.cxx | 3 +-- svx/source/svdraw/svdmodel.cxx | 1 - svx/source/svdraw/svdoattr.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 5 ----- svx/source/svdraw/svdomedia.cxx | 4 ---- svx/source/svdraw/svdotext.cxx | 1 - svx/source/svdraw/svdpage.cxx | 3 --- svx/source/svdraw/svdpdf.cxx | 1 - svx/source/svdraw/svdsnpv.cxx | 1 - svx/source/svdraw/svdundo.cxx | 3 +-- svx/source/svdraw/svdview.cxx | 1 - svx/source/table/tablecolumn.cxx | 1 - svx/source/table/tablemodel.cxx | 1 - svx/source/table/tablerow.cxx | 1 - svx/source/tbxctrls/PaletteManager.cxx | 3 --- svx/source/tbxctrls/colrctrl.cxx | 1 - svx/source/tbxctrls/grafctrl.cxx | 1 - svx/source/tbxctrls/layctrl.cxx | 1 - svx/source/tbxctrls/tbunocontroller.cxx | 1 - svx/source/tbxctrls/tbxcolorupdate.cxx | 1 + svx/source/theme/ThemeColorChangerCommon.cxx | 8 -------- svx/source/theme/ThemeColorPaletteManager.cxx | 1 - svx/source/unodraw/SvxXTextColumns.cxx | 1 - svx/source/unodraw/gluepts.cxx | 1 - svx/source/unodraw/unomod.cxx | 1 - svx/source/unodraw/unopage.cxx | 1 - svx/source/unodraw/unopool.cxx | 2 +- svx/source/unodraw/unoprov.cxx | 1 - svx/source/unodraw/unoshape.cxx | 4 +--- svx/source/unodraw/unoshcol.cxx | 1 + svx/source/xoutdev/xattr.cxx | 2 +- svx/source/xoutdev/xtabgrdt.cxx | 1 - 87 files changed, 31 insertions(+), 121 deletions(-) diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index 4929d9a2ce7d..957956042e73 100644 --- 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 diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 79402d0defce..879dd6019ed1 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/svx/inc/galleryfilestorage.hxx b/svx/inc/galleryfilestorage.hxx index bafbc13c7bad..56d89e03c72e 100644 --- a/svx/inc/galleryfilestorage.hxx +++ b/svx/inc/galleryfilestorage.hxx @@ -23,7 +23,6 @@ #include #include #include "gallerystoragelocations.hxx" -#include "galleryfilestorage.hxx" #include #include #include diff --git a/svx/inc/galleryfilestorageentry.hxx b/svx/inc/galleryfilestorageentry.hxx index 10a020297e72..d051ff3815d4 100644 --- a/svx/inc/galleryfilestorageentry.hxx +++ b/svx/inc/galleryfilestorageentry.hxx @@ -23,7 +23,6 @@ #include #include "galleryfilestorage.hxx" #include "gallerystoragelocations.hxx" -#include "galleryfilestorageentry.hxx" class GalleryObjectCollection; diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index dfe66d3b601a..e2bfcecf9c29 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index f51c97a01ff9..9cab719e7307 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -22,8 +22,6 @@ #include -#include - #include #include diff --git a/svx/inc/shapecollection.hxx b/svx/inc/shapecollection.hxx index 3c3dde9d1ea5..44988281bb75 100644 --- a/svx/inc/shapecollection.hxx +++ b/svx/inc/shapecollection.hxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx index 075c7b28dde7..6633090e0ee9 100644 --- a/svx/inc/tbxcolorupdate.hxx +++ b/svx/inc/tbxcolorupdate.hxx @@ -19,6 +19,7 @@ #pragma once +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/qa/unit/ThemeTest.cxx b/svx/qa/unit/ThemeTest.cxx index c3aeb93b0217..3fea9608c11f 100644 --- a/svx/qa/unit/ThemeTest.cxx +++ b/svx/qa/unit/ThemeTest.cxx @@ -10,9 +10,6 @@ #include #include #include -#include - -#include #include diff --git a/svx/qa/unit/classicshapes.cxx b/svx/qa/unit/classicshapes.cxx index 5f7363952061..1ca580acd429 100644 --- a/svx/qa/unit/classicshapes.cxx +++ b/svx/qa/unit/classicshapes.cxx @@ -17,7 +17,6 @@ #include #include #include -#include using namespace ::com::sun::star; diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx index 3ac58e33394b..a3d17c60e428 100644 --- a/svx/qa/unit/customshapes.cxx +++ b/svx/qa/unit/customshapes.cxx @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -29,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -40,11 +38,8 @@ #include #include #include -#include #include #include -#include -#include using namespace ::com::sun::star; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index f12281793b78..e87232a4f6df 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -38,7 +38,6 @@ #include #include #include -#include // Project-local header diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 5271f1887b83..70c9e4e37b2b 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 2de34e10da16..121a893bfea2 100644 --- 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 #include #include #include @@ -35,8 +36,6 @@ namespace accessibility { -class AccessibleShape; - class ChildDescriptor; // See below for declaration. typedef ::std::vector ChildDescriptorListType; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index b5a0544d75b5..fb65752d67d8 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -30,7 +30,6 @@ #include #include #include -#include namespace svx { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index fb01294fe5ff..75833dcdd914 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -52,7 +52,6 @@ #include #include #include -#include using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 9c39e086edc3..53620a125f3f 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include diff --git a/svx/source/dialog/ThemeColorEditDialog.cxx b/svx/source/dialog/ThemeColorEditDialog.cxx index 4b5e60a8b2a2..eb3bb5dcd9f4 100644 --- a/svx/source/dialog/ThemeColorEditDialog.cxx +++ b/svx/source/dialog/ThemeColorEditDialog.cxx @@ -8,7 +8,6 @@ */ #include -#include #include namespace svx diff --git a/svx/source/dialog/ThemeColorValueSet.cxx b/svx/source/dialog/ThemeColorValueSet.cxx index d33e2fbc85e1..b63703e27c10 100644 --- a/svx/source/dialog/ThemeColorValueSet.cxx +++ b/svx/source/dialog/ThemeColorValueSet.cxx @@ -8,7 +8,6 @@ */ #include -#include #include namespace svx diff --git a/svx/source/dialog/ThemeDialog.cxx b/svx/source/dialog/ThemeDialog.cxx index e3a206be6cab..88ce467834ae 100644 --- a/svx/source/dialog/ThemeDialog.cxx +++ b/svx/source/dialog/ThemeDialog.cxx @@ -12,7 +12,6 @@ #include #include #include -#include #include namespace svx diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 1e40115270bb..46d3a60a3a49 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 69cc90171979..534f8129d2c2 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index fa5829438698..5e05d4c93c58 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 2a770eac57de..7284bfd0874b 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -20,8 +20,6 @@ #include #include -#include -#include #include #include diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index f06822ceaf0b..b5451643f6c8 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -71,8 +71,6 @@ #include #include -#include - #include #include #include diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index f6bc5fa72919..f8de81d60ce1 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -25,7 +25,6 @@ #if HAVE_FEATURE_DBCONNECTIVITY #include #endif -#include #include #include #include diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 4a8f9ee55c63..d76eb48ab921 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index aa26e412a416..4ab6a9f757f8 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -70,7 +70,6 @@ #include #include #include -#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::view; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 242f51dcca34..846544445563 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -63,7 +63,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/gallery2/galleryfilestorage.cxx b/svx/source/gallery2/galleryfilestorage.cxx index e9a8cd0aa8b6..16f2a1c27773 100644 --- a/svx/source/gallery2/galleryfilestorage.cxx +++ b/svx/source/gallery2/galleryfilestorage.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include "codec.hxx" #include "gallerydrawmodel.hxx" #include diff --git a/svx/source/inc/StylesPreviewToolBoxControl.hxx b/svx/source/inc/StylesPreviewToolBoxControl.hxx index f1f943dfffbe..f0466fe6cd6c 100644 --- a/svx/source/inc/StylesPreviewToolBoxControl.hxx +++ b/svx/source/inc/StylesPreviewToolBoxControl.hxx @@ -24,7 +24,6 @@ #include #include "StylesPreviewWindow.hxx" #include -#include class StylesPreviewToolBoxControl final : public cppu::ImplInheritanceHelper diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 84e9af4de2b8..63e0732a5b48 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index 6a96870a4b79..25e44f942f76 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 53fc46fff654..77e5b82df4bd 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -46,7 +46,6 @@ #include #include #include -#include #include diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 9b6e287d8043..710510882204 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index d95d5fbeb75e..500eda6f739c 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include namespace sdr::contact diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index e5292b1515d5..0336078356c2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 21d3a5458cfa..374e2d7c1d4a 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 0e62cd73a37a..a58ec8192004 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -24,7 +24,6 @@ #include #include #include -#include namespace sdr::overlay diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index c4afac654567..7d4afca24205 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -27,14 +27,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include namespace drawinglayer::primitive2d diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 2b9f9b767763..81a854fe6228 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 56ce36b9d095..2b347c8d8304 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index ec98d7a0d07d..f2051aa32f47 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 682b83fc8908..9e9c5b882e52 100644 --- 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 #include #include #include diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index 3ddba2db9e58..813dfc371092 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -24,8 +24,6 @@ #include -#include -#include #include #include #include diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index bda7eb62e632..0046453614a4 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 91cea51325e6..8919140b5d07 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx index d8c86b874336..7c3c6d972329 100644 --- a/svx/source/styles/ColorSets.cxx +++ b/svx/source/styles/ColorSets.cxx @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index d92aac21d89c..c6c0bd1c7059 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -8,7 +8,6 @@ * */ -#include #include #include diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 2c75be5d27d6..8e17f43f16a3 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index ffb1ccc6766c..8da127a9e926 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -23,7 +23,7 @@ // re-creating the connections for contained connectors #include #include -#include +#include void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone) { diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 3f947bce2bf1..afa8efd0b779 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -30,7 +30,6 @@ #include #include #include "svddrgm1.hxx" -#include #include #include #include diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 8c1c60bba681..872e7539abbe 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index ee8945a82149..13e3231c502a 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -34,7 +34,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index cc7e61ea3fb1..f6b79cb4b5b7 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -21,7 +21,9 @@ #include +#if defined _WIN32 && !defined _WIN64 #include +#endif #include #include #include @@ -38,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 521e56d44b9d..c6151ccfd89d 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -28,11 +28,10 @@ #include -#include -#include #include #include #include +#include #include diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index ab882b77ed6c..47272987ec79 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index ae4f59baa5cf..df6b7ffe83c0 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace com::sun::star; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 287313f97956..63844301ef1a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -21,9 +21,7 @@ #include #include -#include -#include #include #include #include @@ -44,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -113,8 +110,6 @@ #include #include -#include - #include #include #include diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 125b69312c41..0bb5ae213c4a 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -29,10 +29,6 @@ #include #include #include -#include -#include -#include -#include #include diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 0b3e40d16f9b..cc8846504752 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index adc8555bf13d..99137d28b4da 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -31,7 +30,6 @@ #include #include -#include #include #include @@ -45,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 7509991ba346..b99145d932be 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index bcef8b3c3ea5..f4ea1ab6bef8 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 0dcfede6e0cc..e9a4023d0de4 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -41,13 +40,13 @@ #include #include // #i124389# #include -#include #include #include #include #include #include #include +#include // iterates over all views and unmarks this SdrObject if it is marked diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 1ee9c1dbcb5e..f88363268c69 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index efa5f41375fd..10e9fbb630a7 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -24,7 +24,6 @@ #include #include "tablecolumn.hxx" #include "tableundo.hxx" -#include #include #include #include diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 982153976387..dc0f10e16109 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -39,7 +39,6 @@ #include "tablecolumns.hxx" #include "tableundo.hxx" #include -#include #include #include #include diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 4545642e3b25..d755f587af20 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -24,7 +24,6 @@ #include #include "tablerow.hxx" #include "tableundo.hxx" -#include #include #include #include diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 5943ce3b8f27..eb1aa6ad1359 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -42,8 +41,6 @@ #include #include #include -#include -#include #include diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index da829d127e5d..daf1a2012492 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 9595bbe89ca1..b2daea684b87 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 0ec276a5a9f1..88dd401555d4 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 148098c10e82..04bd869c8857 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 970fa40181af..0854ad034dc2 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/svx/source/theme/ThemeColorChangerCommon.cxx b/svx/source/theme/ThemeColorChangerCommon.cxx index 82f915fef930..a41e53b7e30b 100644 --- a/svx/source/theme/ThemeColorChangerCommon.cxx +++ b/svx/source/theme/ThemeColorChangerCommon.cxx @@ -11,16 +11,8 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include - #include #include #include diff --git a/svx/source/theme/ThemeColorPaletteManager.cxx b/svx/source/theme/ThemeColorPaletteManager.cxx index 0e4f20899645..eeef402a9661 100644 --- a/svx/source/theme/ThemeColorPaletteManager.cxx +++ b/svx/source/theme/ThemeColorPaletteManager.cxx @@ -11,7 +11,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/unodraw/SvxXTextColumns.cxx b/svx/source/unodraw/SvxXTextColumns.cxx index a33073910e22..0fb36aaedf08 100644 --- a/svx/source/unodraw/SvxXTextColumns.cxx +++ b/svx/source/unodraw/SvxXTextColumns.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 1547b9fed7f0..5ccd9cb02dc0 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index e5927030d133..07b9751ef048 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 350205e5d298..06cebcfc4914 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 5dc577a3e87b..c8d5e59bcbd0 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -22,11 +22,11 @@ #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 13bd99fa4561..b730a31b54da 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index c5aeded2a21f..9b3ea432ba04 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -78,8 +78,6 @@ #include "shapeimpl.hxx" #include -#include -#include #include #include #include diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index be5d07d9b878..fd1fa7239771 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 5f5c51655f3e..2404a59edb50 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -90,7 +90,7 @@ #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 40d881c19dae..11c985b461ad 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include using namespace com::sun::star;