svx/IwyuFilter_svx.yaml | 2 + svx/inc/AccessibleTableShape.hxx | 4 -- svx/inc/GalleryControl.hxx | 2 - svx/inc/dragmt3d.hxx | 1 svx/inc/extrusiondepthdialog.hxx | 2 - svx/inc/galbrws2.hxx | 2 - svx/inc/sdr/attribute/sdrfilltextattribute.hxx | 1 svx/inc/sdr/contact/viewcontactofgraphic.hxx | 1 svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 5 --- svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx | 1 svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx | 1 svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 1 svx/inc/sdr/overlay/overlayrectangle.hxx | 1 svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 2 - svx/inc/sdr/primitive2d/sdrprimitivetools.hxx | 1 svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 2 - svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx | 2 - svx/inc/sdr/properties/e3dcompoundproperties.hxx | 1 svx/inc/sdr/properties/emptyproperties.hxx | 1 svx/source/accessibility/AccessibleFrameSelector.cxx | 1 svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2 + svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 1 svx/source/accessibility/svxrectctaccessiblecontext.cxx | 1 svx/source/form/datanavi.cxx | 2 + svx/source/form/fmPropBrw.cxx | 2 + svx/source/form/fmcontrollayout.cxx | 1 svx/source/form/fmshimp.cxx | 1 svx/source/form/fmview.cxx | 2 + svx/source/form/formcontroller.cxx | 1 svx/source/form/navigatortree.cxx | 1 svx/source/form/xfm_addcondition.cxx | 1 svx/source/inc/AccessibleFrameSelector.hxx | 11 +------ svx/source/inc/GraphCtlAccessibleContext.hxx | 7 ---- svx/source/inc/cell.hxx | 1 svx/source/inc/charmapacc.hxx | 3 +- svx/source/inc/datanavi.hxx | 2 - svx/source/inc/docrecovery.hxx | 3 +- svx/source/inc/filtnav.hxx | 1 svx/source/inc/fmPropBrw.hxx | 1 svx/source/inc/fmcontrollayout.hxx | 1 svx/source/inc/fmexch.hxx | 1 svx/source/inc/fmexpl.hxx | 2 - svx/source/inc/fmpgeimp.hxx | 4 -- svx/source/inc/fmshimp.hxx | 12 -------- svx/source/inc/fmslotinvalidator.hxx | 2 + svx/source/inc/fmtextcontroldialogs.hxx | 1 svx/source/inc/fmtextcontrolshell.hxx | 3 -- svx/source/inc/fmundo.hxx | 1 svx/source/inc/fmvwimp.hxx | 2 - svx/source/inc/formcontrolfactory.hxx | 1 svx/source/inc/formcontroller.hxx | 12 -------- svx/source/inc/formcontrolling.hxx | 1 svx/source/inc/formfeaturedispatcher.hxx | 1 svx/source/inc/formtoolbars.hxx | 2 - svx/source/inc/gridcell.hxx | 2 - svx/source/inc/sdbdatacolumn.hxx | 1 svx/source/inc/svdoutlinercache.hxx | 1 svx/source/inc/svxpixelctlaccessiblecontext.hxx | 18 ------------ svx/source/inc/svxrectctaccessiblecontext.hxx | 20 +------------- svx/source/inc/tablemodel.hxx | 2 - svx/source/sdr/contact/objectcontact.cxx | 2 - svx/source/sdr/contact/objectcontactofpageview.cxx | 1 svx/source/sdr/contact/viewcontactofgraphic.cxx | 1 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 2 - 64 files changed, 36 insertions(+), 138 deletions(-)
New commits: commit f74466abb9067d44ec6f02e2749572a75a213a18 Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Dec 23 20:18:29 2019 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Jan 10 12:55:56 2020 +0100 tdf#42949 Fix IWYU warnings in svx/inc/ and svx/source/inc/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ic19dbb807b6c35e7772878e53a4f00bbb8688b7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85788 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml new file mode 100644 index 000000000000..123a38fd8acc --- /dev/null +++ b/svx/IwyuFilter_svx.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: svx/source/svdraw/svdobj.cxx diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 238687940dd1..85e8ac8f5d73 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_SVX_INC_ACCESSIBLETABLESHAPE_HXX #define INCLUDED_SVX_INC_ACCESSIBLETABLESHAPE_HXX -#include <com/sun/star/table/XTable.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> -#include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <com/sun/star/util/XModifyListener.hpp> #include <rtl/ref.hxx> @@ -32,7 +29,6 @@ #include <svx/AccessibleShape.hxx> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp> -#include <cppuhelper/compbase.hxx> namespace sdr { namespace table { class SvxTableController; diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index ca56dd2f8788..4356c59415d0 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -20,8 +20,6 @@ #define INCLUDED_SVX_INC_GALLERYCONTROL_HXX #include <vcl/window.hxx> -#include <vcl/graph.hxx> -#include <tools/urlobj.hxx> #include <svx/svxdllapi.h> class SfxBindings; diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index a92f3be188f7..de34016e37de 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -24,7 +24,6 @@ #include <svx/svddrgmt.hxx> #include <svx/view3d.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> -#include <vcl/timer.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> // Parameters for the interaction of a 3D object diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index 0e06add86b9e..183bc9b6a603 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX #define INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX -#include <svx/svxdllapi.h> - #include <vcl/weld.hxx> namespace svx { diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index b71de0299855..5a669c3805e4 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_SVX_INC_GALBRWS2_HXX #define INCLUDED_SVX_INC_GALBRWS2_HXX -#include <vcl/button.hxx> #include <vcl/fixed.hxx> -#include <vcl/timer.hxx> #include <vcl/toolbox.hxx> #include <vcl/transfer.hxx> #include <svl/lstner.hxx> diff --git a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx index 672277cda1dc..74d992917fe5 100644 --- a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX #define INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX -#include <sal/types.h> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index fc89e5e501af..e24cc273af93 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX -#include <sal/types.h> #include <svx/sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdograf.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index d689ce144e44..2c498ccd6241 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -21,11 +21,8 @@ #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX #include <com/sun/star/uno/Reference.hxx> -#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> +#include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/svdouno.hxx> -#include <svx/svxdllapi.h> - -#include <memory> class OutputDevice; namespace vcl { class Window; } diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx index fb4198fc5509..132ec9997380 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 681025cce81b..7b12c8332156 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -#include <memory> class SdrGrafObj; diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index df27838fcbb0..1936afc1160a 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> -#include <svx/svxdllapi.h> class OutputDevice; namespace vcl { class Window; } diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx index 0a169d456d99..42e1afed720e 100644 --- a/svx/inc/sdr/overlay/overlayrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrectangle.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYRECTANGLE_HXX #include <svx/sdr/overlay/overlayobject.hxx> -#include <tools/gen.hxx> namespace tools { class PolyPolygon; } diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx index b16a7fd1795f..28b0d3016bcf 100644 --- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/svdobj.hxx> +#include <tools/weakbase.h> // predefinitions diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx index 41217d3c2d5c..9afff3ecc586 100644 --- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX #include <vcl/bitmapex.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index 84bacaf129aa..ce4c91050074 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -27,7 +27,7 @@ #include <editeng/outlobj.hxx> #include <tools/color.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> -#include <tools/weakbase.hxx> +#include <tools/weakbase.h> #include <svx/sdtaitm.hxx> diff --git a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx index cf5ee75689ae..a96e2d5beced 100644 --- a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX #define INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX -#include <sal/types.h> - // predefines class SfxItemSet; diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index 44adf9d97a80..22da0bfcacc4 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX #include <sdr/properties/e3dproperties.hxx> -#include <svx/svxdllapi.h> namespace sdr diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index 821cde2a96b6..734f7be377d5 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -25,6 +25,7 @@ #include <memory> #include <svx/sdr/properties/properties.hxx> +#include <svl/itemset.hxx> namespace sdr diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index e180bec3538b..cb8d1346b4fa 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -49,7 +49,6 @@ using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::XInterface; using ::com::sun::star::lang::Locale; using ::com::sun::star::lang::EventObject; -using ::com::sun::star::awt::XFocusListener; using namespace ::com::sun::star::accessibility; diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index f37c14b873a1..1b3f3723f18e 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -20,7 +20,9 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <unotools/accessiblestatesethelper.hxx> diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index ab0ecabbc109..a9880935360f 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/convert.hxx> diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 2557ae3cf05f..e1058f05972f 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/convert.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 83731935f006..3078bd0fa0f6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -46,6 +46,8 @@ #include <sfx2/dispatch.hxx> #include <vcl/weld.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> +#include <vcl/layout.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 710fdb856072..60bcbd7676eb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/FormComponentType.hpp> @@ -46,6 +47,7 @@ #include <com/sun/star/inspection/ObjectInspector.hpp> #include <com/sun/star/inspection/XObjectInspectorUI.hpp> #include <com/sun/star/inspection/DefaultHelpProvider.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/VetoException.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 187fbf87d487..154ffa0bce2f 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -33,6 +33,7 @@ #include <comphelper/processfactory.hxx> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> +#include <unotools/confignode.hxx> #include <unotools/syslocale.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index ca14eef60bd8..b2e2104db820 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -71,6 +71,7 @@ #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 6c089c44c98c..8808bd01dd52 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -57,6 +57,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/form/FormComponentType.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -64,6 +65,7 @@ #include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> +#include <svx/svxids.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index d5fde904fff6..9774abc8e5a4 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/form/control/FilterControl.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/sdb/ParametersRequest.hpp> #include <com/sun/star/sdb/RowChangeAction.hpp> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 9c1dc3ca3dd3..32f1bcf482fb 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -53,6 +53,7 @@ #include <svx/svxdlg.hxx> #include <svx/strings.hrc> #include <tools/diagnose_ex.h> +#include <svx/svxids.hrc> #include <bitmaps.hlst> #include <vcl/treelistentry.hxx> #include <vcl/commandevent.hxx> diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 398623cf9460..d2210073da8d 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -24,6 +24,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> #include <datanavi.hxx> #include <fmservs.hxx> diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 1e042e5cc896..8dfd19675c95 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -20,18 +20,11 @@ #ifndef INCLUDED_SVX_SOURCE_INC_ACCESSIBLEFRAMESELECTOR_HXX #define INCLUDED_SVX_SOURCE_INC_ACCESSIBLEFRAMESELECTOR_HXX -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <tools/link.hxx> -#include <cppuhelper/implbase.hxx> -#include <comphelper/accessibleselectionhelper.hxx> +#include <cppuhelper/implbase1.hxx> +#include<comphelper/accessiblecomponenthelper.hxx> #include <svx/framebordertype.hxx> -#include <vcl/vclptr.hxx> namespace svx { diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 9d348c6f3ce7..9f76359398c5 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -27,21 +27,14 @@ #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <cppuhelper/weak.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/basemutex.hxx> #include <svl/lstner.hxx> -#include <set> #include <map> -#include <svx/rectenum.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> #include <svx/IAccessibleViewForwarder.hxx> #include <svx/AccessibleShape.hxx> diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx index a0c3d1a7e73e..494b7090cc93 100644 --- a/svx/source/inc/cell.hxx +++ b/svx/source/inc/cell.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> -#include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <rtl/ref.hxx> diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index cdc225da1288..6ce383ad923a 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_SVX_SOURCE_INC_CHARMAPACC_HXX #define INCLUDED_SVX_SOURCE_INC_CHARMAPACC_HXX -#include <vcl/image.hxx> #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> +#include <tools/gen.hxx> +#include <rtl/ref.hxx> #include <vector> class SvxShowCharSet; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a1e4a66de53d..108c72d2c909 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -20,8 +20,6 @@ #define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX #include <vcl/builder.hxx> -#include <vcl/fixed.hxx> -#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/menubtn.hxx> #include <vcl/tabctrl.hxx> diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index d6bb75160574..f1002ad08d24 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -24,10 +24,11 @@ #include <o3tl/typed_flags_set.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/task/StatusIndicatorFactory.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #define RECOVERY_CMDPART_PROTOCOL "vnd.sun.star.autorecovery:" diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index eb857b1a5e78..f2da82909840 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -34,7 +34,6 @@ #include <vcl/image.hxx> #include <vcl/treelistbox.hxx> -#include <svx/fmtools.hxx> #include "fmexch.hxx" #include "sqlparserclient.hxx" diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 1d856b96a2fd..4fb36fc595ce 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMPROPBRW_HXX #define INCLUDED_SVX_SOURCE_INC_FMPROPBRW_HXX -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/frame/XFrame2.hpp> #include <com/sun/star/inspection/XObjectInspectorModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 90027568066a..8a8062cfe356 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "fmdocumentclassification.hxx" -#include <unotools/confignode.hxx> namespace svxform diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 62f0c6cb682c..91f24a1fc890 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -26,7 +26,6 @@ #include <sot/exchange.hxx> #include <vcl/transfer.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/form/XForms.hpp> #include <rtl/ref.hxx> #include <tools/link.hxx> diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 861cab0ce3d6..23cf3f6c216b 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -29,12 +29,10 @@ #include <sfx2/ctrlitem.hxx> #include <vcl/image.hxx> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 3e0a2503f149..d2f547bfa45c 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -20,19 +20,15 @@ #define INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX #include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XForms.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XMap.hpp> #include <tools/link.hxx> #include <cppuhelper/weakref.hxx> #include <svx/svxdllapi.h> -#include <map> class FmFormObj; class FmFormPage; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index dd60783d9fa8..43b6a579b2f2 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -19,22 +19,17 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX #define INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdb/XSQLQueryComposer.hpp> #include <com/sun/star/container/ContainerEvent.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/NavigationBarMode.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/form/runtime/FeatureState.hpp> @@ -42,16 +37,12 @@ #include <vcl/menu.hxx> #include <vcl/timer.hxx> #include <vcl/window.hxx> -#include <sfx2/app.hxx> +#include <sfx2/shell.hxx> #include <svx/svdmark.hxx> #include <svx/fmsearch.hxx> -#include <svx/svxids.hrc> -#include <svl/lstner.hxx> #include <svx/fmtools.hxx> -#include <svx/fmsrccfg.hxx> #include <osl/mutex.hxx> -#include <cppuhelper/component.hxx> #include <comphelper/container.hxx> #include <cppuhelper/compbase.hxx> #include <unotools/configitem.hxx> @@ -60,7 +51,6 @@ #include <o3tl/typed_flags_set.hxx> #include <queue> -#include <set> #include <vector> #include <memory> diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index 024c4b8bc0d7..aa000a4eac60 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX #define INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX +#include <sal/types.h> + namespace svx { typedef sal_uInt16 SfxSlotId; diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 8fa79400404d..9b31af0a332a 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX #define INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX -#include <sfx2/sfxsids.hrc> #include <sfx2/tabdlg.hxx> #include <editeng/flstitem.hxx> diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 9512ef097f1b..42a61dea27fa 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -20,9 +20,8 @@ #define INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/awt/FocusEvent.hpp> #include <com/sun/star/awt/XTextComponent.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index a56b2e3fe6ab..f5953ec1f7f1 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> -#include <com/sun/star/script/ScriptEvent.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XContainerListener.hpp> diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 2c0bb54fad90..f833279a42bb 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -30,12 +30,10 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/form/runtime/XFormControllerContext.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/ContainerEvent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/sdb/SQLErrorEvent.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 0f21051f2da6..51dcb78fe0c5 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -24,7 +24,6 @@ #include "fmdocumentclassification.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 7722cccbd8d4..80538a8393d5 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -25,6 +25,7 @@ #include <vector> #include "delayedevent.hxx" +#include "fmcontrolbordermanager.hxx" #include "formdispatchinterceptor.hxx" #include "sqlparserclient.hxx" @@ -36,15 +37,9 @@ #include <com/sun/star/awt/XTabController.hpp> #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/form/DatabaseDeleteEvent.hpp> #include <com/sun/star/form/DatabaseParameterEvent.hpp> -#include <com/sun/star/form/ErrorEvent.hpp> #include <com/sun/star/form/validation/XFormComponentValidityListener.hpp> -#include <com/sun/star/form/XConfirmDeleteBroadcaster.hpp> #include <com/sun/star/form/XConfirmDeleteListener.hpp> -#include <com/sun/star/form/XDatabaseParameterBroadcaster2.hpp> #include <com/sun/star/form/XDatabaseParameterListener.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/form/runtime/XFilterController.hpp> @@ -55,18 +50,13 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> -#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> #include <com/sun/star/sdb/XRowSetApproveListener.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> #include <com/sun/star/sdb/XSQLErrorListener.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/util/XModeSelector.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <comphelper/proparrhlp.hxx> diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index db72e9114ebb..73de3d9538d9 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX #include <com/sun/star/form/runtime/XFormController.hpp> -#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/runtime/FeatureState.hpp> #include <com/sun/star/form/runtime/XFormOperations.hpp> #include <com/sun/star/sdb/XSQLErrorListener.hpp> diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index b0d683ab6827..b7a664c736e4 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SOURCE_INC_FORMFEATUREDISPATCHER_HXX #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/form/runtime/XFormOperations.hpp> #include <cppuhelper/implbase.hxx> diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index c2321e0bef6a..1a77613bf734 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX #define INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX -#include "fmdocumentclassification.hxx" #include <com/sun/star/frame/XLayoutManager.hpp> -#include <svx/svxdllapi.h> namespace svxform { diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 029e82547e5b..93511576956f 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XCheckBox.hpp> #include <com/sun/star/awt/XButton.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/form/XChangeBroadcaster.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -44,6 +43,7 @@ #include <comphelper/propmultiplex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/uno3.hxx> +#include <connectivity/formattedcolumnvalue.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 0b2dfac89ba8..76d8039c82c2 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdb/XColumnUpdate.hpp> -#include <osl/diagnose.h> namespace svxform diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx index a919da2ab89d..0dc4994cc29d 100644 --- a/svx/source/inc/svdoutlinercache.hxx +++ b/svx/source/inc/svdoutlinercache.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX #define INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX -#include <sal/types.h> #include <memory> #include <vector> #include <set> diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 29ee940e7442..f9f3d6a610f1 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -20,28 +20,12 @@ #define INCLUDED_SVX_SOURCE_INC_SVXPIXELCTLACCESSIBLECONTEXT_HXX #include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/accessibleselectionhelper.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/compbase6.hxx> -#include <cppuhelper/compbase5.hxx> -#include <cppuhelper/basemutex.hxx> -#include <svx/rectenum.hxx> +#include <rtl/ref.hxx> #include <tools/gen.hxx> diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 7dbbd48327e7..40b2551c9730 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -22,30 +22,14 @@ #define INCLUDED_SVX_SOURCE_INC_SVXRECTCTACCESSIBLECONTEXT_HXX #include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <osl/mutex.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/compbase6.hxx> -#include <cppuhelper/compbase7.hxx> -#include <cppuhelper/compbase3.hxx> -#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/implbase3.hxx> #include <comphelper/accessibleselectionhelper.hxx> +#include <rtl/ref.hxx> #include <svx/rectenum.hxx> -#include <vcl/vclptr.hxx> #include <tools/gen.hxx> #include <vector> diff --git a/svx/source/inc/tablemodel.hxx b/svx/source/inc/tablemodel.hxx index 78aabc51f692..d203bb9719df 100644 --- a/svx/source/inc/tablemodel.hxx +++ b/svx/source/inc/tablemodel.hxx @@ -23,8 +23,6 @@ #include <sal/types.h> #include <com/sun/star/util/XBroadcaster.hpp> #include <com/sun/star/table/XTable.hpp> -#include <basegfx/range/b2irectangle.hxx> -#include <basegfx/tuple/b2ituple.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include "celltypes.hxx" diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 1f5f5b3c4c1e..a8ee40706d99 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -25,8 +25,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/animation/objectanimator.hxx> -#include <eventhandler.hxx> - using namespace com::sun::star; namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index de81b46fe5f4..2718c491732f 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -40,7 +40,6 @@ #include <vcl/canvastools.hxx> #include <comphelper/lok.hxx> -#include <eventhandler.hxx> #include <memory> using namespace com::sun::star; diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index d67df26a067f..3951159be56b 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -51,7 +51,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -#include <eventhandler.hxx> #include <bitmaps.hlst> namespace sdr diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 0e6fbcfc447a..30440f6127fc 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -24,8 +24,6 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <eventhandler.hxx> - namespace sdr { namespace contact _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
