diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-11-15 23:17:23 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-07 10:39:41 +0100 |
commit | 5cfac9be8a55348e7d3bc773aae5bff6b1739080 (patch) | |
tree | b07590d670ab10e622c63cae10e848efe8383bbe | |
parent | e70168ec88642dc4940bf6cf7ae49a97afc84916 (diff) |
tdf#42949 Fix new IWYU warnings in sd/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I360874fb66c9359abf46a00116d73f87ad122168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106083
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
73 files changed, 103 insertions, 138 deletions
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index e958d8bbffe0..19e1a3694b31 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -1,6 +1,22 @@ --- assumeFilename: sd/source/core/drawdoc.cxx excludelist: + sd/qa/unit/SdrPdfImportTest.cxx: + # Actually used + - comphelper/scopeguard.hxx + # Needed on WIN to compile + - prewin.h + - postwin.h + - fpdfview.h + sd/sdi/sdslots.hrc: + # Needed for sdi files to compile + - sfx2/sfxsids.hrc + - editeng/editids.hrc + - editeng/memberids.h + - svx/svxids.hrc + - svx/unomid.hxx + - app.hrc + - sdattr.hrc sd/inc/CustomAnimationCloner.hxx: # base class has to be a complete type - com/sun/star/animations/XAnimationNode.hpp @@ -414,6 +430,9 @@ excludelist: - svx/xlnwtit.hxx - svx/xtextit0.hxx - svx/zoomslideritem.hxx + sd/source/core/drawdoc.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp sd/source/core/text/textapi.cxx: # Needed for macro defines - editeng/unoprnms.hxx @@ -423,6 +442,9 @@ excludelist: sd/source/filter/eppt/pptx-animations.hxx: # Needed for typedef - sax/fshelper.hxx + sd/source/filter/eppt/pptexanimations.cxx: + # Needed for template + - com/sun/star/drawing/XDrawPage.hpp sd/source/filter/eppt/pptx-epptooxml.cxx: # Needed for direct member access - com/sun/star/task/XStatusIndicator.hpp @@ -433,12 +455,21 @@ excludelist: - com/sun/star/beans/XPropertyState.hpp - com/sun/star/style/TabStop.hpp - com/sun/star/graphic/XGraphic.hpp + sd/source/filter/eppt/epptso.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp + sd/source/filter/ppt/pptinanimations.cxx: + # Needed for template + - com/sun/star/drawing/XDrawPage.hpp sd/source/filter/xml/sdxmlwrp.cxx: # Needed for implicit dtor - editeng/outlobj.hxx sd/source/filter/xml/sdtransform.cxx: # Needed for implicit dtor - editeng/outlobj.hxx + sd/source/ui/annotations/annotationtag.cxx: + # Needed for template + - com/sun/star/office/XAnnotation.hpp sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx: # Needed for DEBUG_SD_CONFIGURATION_TRACE - ConfigurationTracer.hxx @@ -463,15 +494,56 @@ excludelist: sd/source/ui/func/fuhhconv.cxx: # Needed for direct member access - com/sun/star/awt/XWindow.hpp + sd/source/ui/dlg/RemoteDialogClientBox.cxx: + # Actually used + - vector + sd/source/ui/dlg/sdtreelb.cxx: + # Needed for template + - com/sun/star/embed/XEmbeddedObject.hpp + sd/source/ui/func/futempl.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp + sd/source/ui/presenter/PresenterHelper.cxx: + # Needed for template + - com/sun/star/awt/XWindowPeer.hpp + sd/source/ui/sidebar/MasterPageObserver.cxx: + # Actually used + - set + sd/source/ui/slideshow/PaneHider.cxx: + # Needed for template + - com/sun/star/frame/XController.hpp sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx: # Needed for instantiation of function template specialization - Window.hxx + # Needed for rtl::math::round + - rtl/math.hxx + sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx: + # Needed for OSL_DEBUG_LEVEL >=2 + - sal/log.hxx + sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx: + # Needed for template + - com/sun/star/frame/XController.hpp + sd/source/ui/slidesorter/controller/SlsListener.cxx: + # Needed for template + - com/sun/star/frame/FrameActionEvent.hpp + sd/source/ui/unoidl/sddetect.cxx: + # Needed for template + - com/sun/star/beans/PropertyValue.hpp + sd/source/ui/unoidl/unoobj.cxx: + # Needed for template + - com/sun/star/beans/PropertyState.hpp + sd/source/ui/unoidl/unodoc.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp sd/source/ui/view/GraphicObjectBar.cxx: # Needed by a sdslots.hxx constant - svx/svxids.hrc sd/source/ui/view/Outliner.cxx: # comphelper::ScopeGuard is actually used - comphelper/scopeguard.hxx + sd/source/ui/view/PresentationViewShellBase.cxx: + # Needed for template + - com/sun/star/frame/XFrame.hpp sd/source/ui/view/drviews1.cxx: # comphelper::ScopeGuard is actually used - comphelper/scopeguard.hxx @@ -481,6 +553,9 @@ excludelist: sd/source/ui/view/drvwshrg.cxx: # Needed by a sdslots.hxx constant - app.hrc + sd/source/ui/view/sdview2.cxx: + # Needed for template + - com/sun/star/embed/XEmbeddedObject.hpp sd/source/ui/view/presvish.cxx: # Needed by a sdslots.hxx constant - svx/svxids.hrc diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx index 883512506c78..4c5c16df2639 100644 --- a/sd/inc/Annotation.hxx +++ b/sd/inc/Annotation.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/propertysetmixin.hxx> -#include "drawdoc.hxx" #include "sdpage.hxx" #include "textapi.hxx" #include "sddllapi.h" diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc index 309dbfc47324..57119cc730e9 100644 --- a/sd/inc/errhdl.hrc +++ b/sd/inc/errhdl.hrc @@ -22,6 +22,8 @@ #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +#include <svtools/ehdl.hxx> +#include <vcl/errcode.hxx> #include "sderror.hxx" const ErrMsgCode RID_SD_ERRHDL[] = diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 153d8573da42..3417f4bda1f7 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -22,8 +22,6 @@ #include <osl/interlck.h> -#include <sddllapi.h> - namespace sd { /** A simple base implementation for reference-counted components. diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc index 6d45a7957e87..979864a0f5f7 100644 --- a/sd/inc/pageformatpanel.hrc +++ b/sd/inc/pageformatpanel.hrc @@ -10,6 +10,8 @@ #ifndef INCLUDED_SD_INC_PAGEFORMATPANEL_HRC #define INCLUDED_SD_INC_PAGEFORMATPANEL_HRC +#include <utility> + #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) namespace sd diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 57df73cd193a..771af280103f 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX #include <svx/sdrundomanager.hxx> -#include <sddllapi.h> namespace sd { diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx index 3125663d1908..657bb416c361 100644 --- a/sd/qa/unit/SdrPdfImportTest.cxx +++ b/sd/qa/unit/SdrPdfImportTest.cxx @@ -10,25 +10,28 @@ #include <test/bootstrapfixture.hxx> #include <unotest/macros_test.hxx> -#include <svdpdf.hxx> - #include <config_features.h> #include <comphelper/scopeguard.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> +// Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including windows.h in a way that +// it will define e.g. Yield as a macro: +#include <prewin.h> +#include <postwin.h> +#include <fpdfview.h> + #include <unotools/tempfile.hxx> #include <unotools/mediadescriptor.hxx> #include <tools/stream.hxx> #include <svx/svdograf.hxx> #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> +#include <vcl/filter/PDFiumLibrary.hxx> +#include <vcl/pdf/PDFAnnotationSubType.hxx> #include <DrawDocShell.hxx> -#include <DrawController.hxx> #include <ViewShell.hxx> -#include <drawdoc.hxx> #include <sdpage.hxx> #include <unomodel.hxx> diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index cd3a3cf82151..27f2c65c78d5 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -14,10 +14,8 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/ClickAction.hpp> -#include <sfx2/sfxdlg.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> -#include <svl/aeitem.hxx> #include <editeng/colritem.hxx> #include <svx/xfillit0.hxx> #include <vcl/svapp.hxx> diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index cc883a8fb019..cb496b6a2c83 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -20,8 +20,10 @@ #include <unotools/mediadescriptor.hxx> #include <rtl/ustring.hxx> +#ifdef _WIN32 #include <vcl/opengl/OpenGLWrapper.hxx> #include <vcl/skia/SkiaHelper.hxx> +#endif #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 41402e006367..8906d780c4bf 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -17,8 +17,6 @@ #include "sdmodeltestbase.hxx" -#include <o3tl/cppunittraitshelper.hxx> -#include <svl/stritem.hxx> #include <editeng/eeitem.hxx> #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> @@ -28,8 +26,6 @@ #include <editeng/colritem.hxx> #include <editeng/numitem.hxx> #include <editeng/unoprnms.hxx> -#include <sfx2/app.hxx> -#include <sfx2/sfxsids.hrc> #include <svl/style.hxx> #include <svx/svdotext.hxx> diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx index beba53b67078..e01ec99c3227 100644 --- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx +++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx @@ -16,17 +16,11 @@ #include <test/helper/transferable.hxx> #include <test/xmltesttools.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/dispatchcommand.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/string.hxx> #include <comphelper/lok.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/lokhelper.hxx> -#include <sfx2/viewfrm.hxx> #include <svl/srchitem.hxx> -#include <svl/stritem.hxx> #include <vcl/scheduler.hxx> #include <ViewShellBase.hxx> #include <ViewShell.hxx> diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 7464635e5e4d..73ab1f1b6b97 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -31,7 +31,6 @@ #include <osl/conditn.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svl/srchitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <comphelper/lok.hxx> diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index 2b492be3fffd..2b4dc6c10c51 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -14,6 +14,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> #include <comphelper/processfactory.hxx> @@ -33,7 +34,6 @@ #include <vcl/scheduler.hxx> #include <DrawDocShell.hxx> -#include <DrawController.hxx> #include <ViewShell.hxx> #include <app.hrc> #include <drawdoc.hxx> diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 1082f9d8500b..1afc9f360e51 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <sal/log.hxx> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/util/XCloneable.hpp> @@ -26,7 +25,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/FastParser.hpp> +#include <com/sun/star/xml/sax/XFastParser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/presentation/EffectPresetClass.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -41,7 +40,6 @@ #include <tools/stream.hxx> #include <tools/diagnose_ex.h> -#include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> #include <CustomAnimationPreset.hxx> diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index d1562581c7bd..8831b3f337a8 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <Annotation.hxx> +#include <drawdoc.hxx> #include <boost/property_tree/json_parser.hpp> diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index c6d663ba2696..566909a4240a 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -22,7 +22,6 @@ #include <sal/log.hxx> #include <tools/debug.hxx> #include <sfx2/printer.hxx> -#include <sfx2/viewsh.hxx> #include <editeng/paperinf.hxx> #include <svx/svdopage.hxx> #include <svx/svdoole2.hxx> @@ -38,7 +37,6 @@ #include <svx/svdlayer.hxx> #include <svx/svditer.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index aa44c9170b83..798d48b2543e 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -22,8 +22,8 @@ #include <comphelper/classids.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -#include <comphelper/lok.hxx> +#include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> #include <editeng/outliner.hxx> #include <editeng/eeitem.hxx> @@ -37,7 +37,6 @@ #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdopage.hxx> -#include <sfx2/lokhelper.hxx> #include <editeng/pbinitem.hxx> #include <svx/svdundo.hxx> #include <svl/hint.hxx> @@ -87,8 +86,6 @@ #include <svx/unoapi.hxx> #include <unokywds.hxx> -#include <set> - using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index 4b52f9e4b574..669dd0c0c769 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <svx/svxids.hrc> #include <sfx2/docfile.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 2425a5fd4de4..0e6a1b5ad8f9 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -29,7 +29,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/sfxsids.hrc> -#include <sot/storage.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> #include <Outliner.hxx> @@ -56,7 +55,6 @@ #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/FastParser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 4b573d803909..ba7a546045d2 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -25,9 +25,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index a5bb8ef68581..a8c37fa892a1 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -19,7 +19,6 @@ #include <AccessiblePresentationGraphicShape.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <SdShapeTypes.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index be98d89711f6..411d04af15f0 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -19,7 +19,6 @@ #include <AccessiblePresentationOLEShape.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <SdShapeTypes.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index a0713fe857ca..3dacf6e73e8e 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -25,7 +25,6 @@ #include <sdresid.hxx> #include <svx/ShapeTypeHandler.hxx> -#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <com/sun/star/drawing/XShape.hpp> using namespace ::com::sun::star; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index ee22e18fc28a..a4b247662855 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -42,7 +42,6 @@ #include <vcl/weld.hxx> #include <vcl/settings.hxx> -#include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/objsh.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index ea8ebaed3158..1b4d345f7db3 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONDIALOG_HXX #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONDIALOG_HXX -#include <vcl/svapp.hxx> #include <vcl/weld.hxx> namespace sd { diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 63ab45f8b6cd..b3043e7eaca9 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -62,27 +62,18 @@ #include <svx/fillctrl.hxx> #include <svx/fontwork.hxx> #include <svx/formatpaintbrushctrl.hxx> -#include <svx/ParaLineSpacingPopup.hxx> -#include <svx/TextCharacterSpacingPopup.hxx> -#include <svx/TextUnderlinePopup.hxx> #include <svx/grafctrl.hxx> #include <svx/hyperdlg.hxx> #include <svx/imapdlg.hxx> -#include <svx/layctrl.hxx> -#include <svx/lboxctrl.hxx> #include <svx/linectrl.hxx> #include <svx/modctrl.hxx> #include <svx/pszctrl.hxx> #include <svx/srchdlg.hxx> #include <svx/SvxColorChildWindow.hxx> -#include <svx/tbcontrl.hxx> -#include <svx/verttexttbxctrl.hxx> #include <svx/xmlsecctrl.hxx> #include <svx/zoomctrl.hxx> #include <svx/zoomsliderctrl.hxx> #include <svx/tbxctl.hxx> -#include <sfx2/emojipopup.hxx> -#include <sfx2/charmappopup.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <comphelper/lok.hxx> #include <sdabstdlg.hxx> diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index bb67585ce8eb..c1edb30a548b 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -37,7 +37,6 @@ #include <sfx2/opengrf.hxx> #include <strings.hrc> -#include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <sal/log.hxx> #include <vcl/virdev.hxx> diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 5065ced24d20..3943b050bb17 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -37,7 +37,6 @@ #include <strings.hxx> #include <bulmaper.hxx> #include <DrawDocShell.hxx> -#include <svl/aeitem.hxx> namespace sd { diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index a149a65ce74e..b6d04173d814 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -29,7 +29,6 @@ #include <sdresid.hxx> #include <strings.hrc> -#include <svl/aeitem.hxx> #include <svl/eitem.hxx> #include <svx/flagsdef.hxx> diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index f7d8e2ef79c3..75dab3897ae7 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -21,7 +21,6 @@ #include <svx/svdpagv.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> -#include <svl/aeitem.hxx> #include <svtools/unitconv.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 6f431d713307..1c2c4f217c04 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -28,25 +28,20 @@ #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> -#include <vcl/menu.hxx> - #include <sfx2/viewfrm.hxx> #include <pres.hxx> #include <navigatr.hxx> #include <pgjump.hxx> #include <app.hrc> -#include <strings.hrc> #include <bitmaps.hlst> #include <drawdoc.hxx> #include <DrawDocShell.hxx> -#include <sdresid.hxx> #include <ViewShell.hxx> #include <ViewShellBase.hxx> #include <slideshow.hxx> #include <FrameView.hxx> -#include <helpids.h> #include <Window.hxx> /** diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 55dada4755d3..5b8ff1dab8d7 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -23,7 +23,7 @@ #include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <svl/style.hxx> -#include <svx/svdobj.hxx> +#include <svx/svdobjkind.hxx> #include <editeng/eeitem.hxx> #include <editeng/numitem.hxx> #include <svl/cjkoptions.hxx> diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index cfb80456e011..2b686a3e8882 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -20,7 +20,6 @@ #include <sdabstdlg.hxx> #include <osl/module.hxx> -#include <rtl/ustring.hxx> typedef SdAbstractDialogFactory* (*SdFuncPtrCreateDialogFactory)(); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index ed84546be179..332b5f646747 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -18,7 +18,6 @@ */ #include <sal/types.h> -#include <sal/log.hxx> #include <sot/formats.hxx> #include <vcl/weld.hxx> #include <svx/svditer.hxx> @@ -51,8 +50,6 @@ #include <svtools/embedtransfer.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> -#include <comphelper/scopeguard.hxx> using namespace com::sun::star; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index be18308bb820..d782010fd87a 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -35,7 +35,6 @@ #include <sfx2/app.hxx> #include <unotools/pathoptions.hxx> #include <svx/svdograf.hxx> -#include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <svx/svdoole2.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 302f96bf4d96..0d1b336acd02 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Window.hxx> #include <DrawDocShell.hxx> #include <svx/svxids.hrc> @@ -38,7 +37,6 @@ #include <editeng/editobj.hxx> #include <com/sun/star/i18n/TextConversionOption.hpp> #include <sfx2/notebookbar/SfxNotebookBar.hxx> -#include <drawview.hxx> #include <editeng/editeng.hxx> #include <sdmod.hxx> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index dd1230163241..f616e1da2157 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -63,7 +63,6 @@ #include <sdresid.hxx> #include <DrawViewShell.hxx> #include <ViewShellBase.hxx> -#include <Window.hxx> #include <OutlineView.hxx> #include <OutlineViewShell.hxx> #include <sdxmlwrp.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index f0c1a0af5f75..dfe5bc3f46d3 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -51,8 +51,6 @@ #include <View.hxx> #include <drawdoc.hxx> -#include <fupoor.hxx> -#include <fusearch.hxx> #include <ViewShell.hxx> #include <unomodel.hxx> #include <undo/undomanager.hxx> diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 5cd99fbc1cb4..576ff10d3b79 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -25,7 +25,6 @@ #include <vcl/svapp.hxx> #include <sal/log.hxx> -#include <osl/diagnose.h> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp> diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 304636bbaf2c..e20fa1dd6e7a 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -26,7 +26,6 @@ #include <ViewShellBase.hxx> #include <sfx2/printer.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 0babe0a565c0..387ee86a458f 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -23,7 +23,6 @@ #include <vcl/ptrstyle.hxx> #include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> -#include <svx/svdoole2.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <svx/bmpmask.hxx> diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 2673611f63a4..d6b7fa49115d 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -26,7 +26,6 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/sfxdlg.hxx> -#include <svl/aeitem.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svx/svdopath.hxx> diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index ff9840e82424..9913f9635181 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -18,7 +18,6 @@ */ #include <fusnapln.hxx> -#include <svl/aeitem.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index a44e89b3b34b..db565991a74c 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -36,7 +36,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/lokhelper.hxx> #include <sfx2/request.hxx> #include <editeng/editeng.hxx> #include <svx/svdoutl.hxx> diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 02db64fbdedf..c8c10fecf402 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_UI_INC_TEMPLATESCANNER_HXX #include "tools/AsynchronousTask.hxx" -#include <sddllapi.h> #include <ucbhelper/content.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index d13581aefc67..ee9ad1ff5266 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -22,7 +22,6 @@ #include <svl/ctloptions.hxx> #include <vcl/vclptr.hxx> -#include <sddllapi.h> #include <vector> diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 2d41de1af250..1b1873f2ed62 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -22,6 +22,8 @@ #include "View.hxx" +#include <sddllapi.h> + namespace sd { class DrawDocShell; diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index f4adedf0cb4f..6db918664a05 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_INS_PASTE_HXX #define INCLUDED_SD_SOURCE_UI_INC_INS_PASTE_HXX -#include <sddllapi.h> - #include <vcl/weld.hxx> // SdInsertPasteDlg diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 1a0d9b1407b5..5e54e193c526 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX #define INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX -#include <vcl/toolbox.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include "sdtreelb.hxx" diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 3c9527b175f4..9a7d5f1a4c34 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 4fae9a6bb5b7..c6326fd7be57 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -25,7 +25,6 @@ #include <svtools/valueset.hxx> #include <vcl/menu.hxx> -#include <vcl/transfer.hxx> #include <sfx2/request.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index ebdf2121447a..db070d25bb4c 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -24,14 +24,12 @@ #include "MasterPageContainerFiller.hxx" #include "MasterPageContainerQueue.hxx" #include <PreviewRenderer.hxx> -#include <tools/AsynchronousTask.hxx> #include <tools/SdGlobalResourceContainer.hxx> #include <strings.hrc> #include <algorithm> #include <memory> #include <unomodel.hxx> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sd/source/ui/sidebar/PageMarginUtils.hxx b/sd/source/ui/sidebar/PageMarginUtils.hxx index 9fcab95af75e..9a1f834937a7 100644 --- a/sd/source/ui/sidebar/PageMarginUtils.hxx +++ b/sd/source/ui/sidebar/PageMarginUtils.hxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <cmath> +#include <tools/long.hxx> #define SDPAGE_NO_MARGIN 0 #define SDPAGE_NARROW_VALUE 635 #define SDPAGE_MODERATE_LR 955 diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 5341acc24f13..e92c936c92a8 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -31,16 +31,16 @@ #include <DrawDocShell.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> -#include <sdmod.hxx> -#include <optsitem.hxx> #include "PageMarginUtils.hxx" #include <strings.hrc> #include <pageformatpanel.hrc> #include <DrawViewShell.hxx> +#include <svl/intitem.hxx> #include <svx/colorbox.hxx> +#include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> +#include <svx/itemwin.hxx> #include <svx/pageitem.hxx> -#include <tools/urlobj.hxx> #include <app.hrc> #include <editeng/paperinf.hxx> #include <svx/xflgrit.hxx> @@ -62,10 +62,8 @@ #include <editeng/sizeitem.hxx> #include <comphelper/lok.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <unomodel.hxx> #include <sfx2/lokhelper.hxx> -#include <boost/property_tree/ptree.hpp> using namespace ::com::sun::star; diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 0fbf7718d913..1303356a3867 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -21,13 +21,11 @@ #define INCLUDED_SD_SOURCE_UI_SIDEBAR_SLIDEBACKGROUND_HXX #include <memory> -#include <svl/intitem.hxx> -#include <svx/dlgutil.hxx> #include <sfx2/sidebar/PanelLayout.hxx> -#include <svx/itemwin.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <svx/papersizelistbox.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> +#include <vcl/EnumContext.hxx> namespace sd { class ViewShellBase; } namespace sd::tools { class EventMultiplexerEvent; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 025f6251afaf..8df823778177 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -24,7 +24,6 @@ #include "SlsBitmapCompressor.hxx" #include "SlsCacheConfiguration.hxx" -#include <osl/diagnose.h> #include <sal/log.hxx> // Define the default value for the maximal cache size that is used for diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index b4a44530ca57..96dc82b9be4b 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> -#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index c3bd9adcb31c..bc65ac5be70c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/outlobj.hxx> - #include <controller/SlsSlotManager.hxx> #include <SlideSorter.hxx> #include <SlideSorterViewShell.hxx> diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index e7f3d90b3026..a531943096f1 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -35,7 +35,6 @@ #include <model/SlsPageDescriptor.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> -#include <cache/SlsCacheContext.hxx> #include <PaneDockingWindow.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 4fce1f9bf324..3e4fa36b05d8 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -50,7 +50,6 @@ #include <editeng/eeitem.hxx> #include <svx/sdr/table/tabledesign.hxx> #include <o3tl/enumrange.hxx> -#include <o3tl/string_view.hxx> #include "TableDesignPane.hxx" #include <createtabledesignpanel.hxx> diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 0bd705bd60fe..3af789b9eec8 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -20,7 +20,6 @@ #include <tools/TimerBasedTaskExecution.hxx> #include <tools/AsynchronousTask.hxx> #include <tools/time.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <memory> diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 201e0e7fe2d7..83a5e8f28967 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -18,7 +18,6 @@ */ #include <DrawController.hxx> -#include <DrawDocShell.hxx> #include <sdpage.hxx> #include <ViewShell.hxx> @@ -38,7 +37,6 @@ #include <com/sun/star/drawing/framework/ModuleController.hpp> #include <com/sun/star/drawing/XDrawSubController.hpp> #include <com/sun/star/drawing/XLayer.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <slideshow.hxx> diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 44eae1c2a46b..e8fa8af3d2f4 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sddll.hxx> #include <DrawDocShell.hxx> diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 4160a8bdc3a6..5ad1afb6c58e 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <boost/property_tree/json_parser.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> @@ -46,7 +45,6 @@ #include "unopool.hxx" #include <sfx2/lokhelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <editeng/UnoForbiddenCharsTable.hxx> @@ -58,7 +56,6 @@ #include <svx/svdundo.hxx> #include <svx/unoapi.hxx> #include <svx/unofill.hxx> -#include <editeng/flditem.hxx> #include <editeng/fontitem.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <svx/svdpool.hxx> diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 74af5d1223b6..4ac4580cd118 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -24,7 +24,6 @@ #include <svx/svdotext.hxx> #include <svl/poolitem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/numitem.hxx> #include <svl/whiter.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 1464a5d06c30..1f64da0b7e1c 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -44,7 +44,6 @@ #include <editeng/writingmodeitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/fhgtitem.hxx> -#include <comphelper/lok.hxx> #include <sfx2/objface.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 69e83e18f2db..582223ed0fa3 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -42,7 +42,6 @@ #include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdobj.hxx> #include <editeng/flstitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/writingmodeitem.hxx> diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index a81fa4f5a5e4..11f42901b9fd 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -75,18 +75,13 @@ #include <svx/sdtagitm.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> -#include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <svx/sdtfsitm.hxx> #include <svx/sdmetitm.hxx> -#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnedwit.hxx> -#include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/chrtitem.hxx> #include <svx/xlnclit.hxx> @@ -180,13 +175,12 @@ #include <sfx2/sidebar/Sidebar.hxx> #include <sfx2/classificationhelper.hxx> #include <sdmod.hxx> +#include <model/SlsPageDescriptor.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <SlideSorter.hxx> +#include <view/SlideSorterView.hxx> #include <SlideSorterViewShell.hxx> #include <controller/SlideSorterController.hxx> -#include <model/SlideSorterModel.hxx> -#include <controller/SlsSelectionManager.hxx> -#include <controller/SlsInsertionIndicatorHandler.hxx> #include <controller/SlsPageSelector.hxx> #include <ViewShellBase.hxx> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 93c1bc846a26..9ce0bab63e4d 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -30,8 +30,6 @@ #include <svx/rulritem.hxx> #include <svx/svdouno.hxx> #include <editeng/eeitem.hxx> -#include <editeng/flditem.hxx> -#include <editeng/outlobj.hxx> #include <editeng/sizeitem.hxx> #include <editeng/urlfieldhelper.hxx> #include <officecfg/Office/Impress.hxx> diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 6dc4448d32f1..879051bc4c1f 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -20,7 +20,6 @@ #include <DrawViewShell.hxx> #include <svx/svxids.hrc> -#include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <sfx2/childwin.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 4446bb657fa1..58b5ca0da82a 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -60,11 +60,6 @@ #include <svx/nbdtmgfact.hxx> #include <svx/nbdtmg.hxx> #include <memory> -#include <svx/xfillit0.hxx> -#include <comphelper/lok.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> - -#include <com/sun/star/drawing/FillStyle.hpp> using namespace com::sun::star::drawing; using namespace svx::sidebar; diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index ba5a19a5c118..6263acd7308d 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -1,11 +1,6 @@ --- assumeFilename: svx/source/svdraw/svdobj.cxx excludelist: - svx/source/inc/svdpdf.hxx: - # Needed for SdrPdfImportTest in sd to compile on WIN - - prewin.h - - postwin.h - - fpdfview.h svx/source/accessibility/ChildrenManagerImpl.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp diff --git a/svx/source/inc/svdpdf.hxx b/svx/source/inc/svdpdf.hxx index bf0620db4ef5..271eb1fd6dee 100644 --- a/svx/source/inc/svdpdf.hxx +++ b/svx/source/inc/svdpdf.hxx @@ -35,12 +35,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> -// Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including windows.h in a way that -// it will define e.g. Yield as a macro: -#include <prewin.h> -#include <postwin.h> -#include <fpdfview.h> - #include <vcl/filter/PDFiumLibrary.hxx> // Forward Declarations |