From bff31df1398b81c0348aebae2c346474724c4884 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Fri, 8 Jun 2018 01:16:42 +0200 Subject: tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[a-c]* Found with bin/find-unneeded-includes Only removal proposals are dealt with here, with a bit of fallout management Change-Id: Ifcfd19b845146e8af386090d898c1f6ef6c98100 Reviewed-on: https://gerrit.libreoffice.org/55449 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sd/IwyuFilter_sd.yaml | 28 ++++++++++++++++++++++ .../accessibility/AccessibleDocumentViewBase.cxx | 6 +++++ .../accessibility/AccessibleDrawDocumentView.cxx | 4 +++- .../AccessiblePresentationGraphicShape.cxx | 1 + .../AccessiblePresentationOLEShape.cxx | 1 + sd/source/ui/dlg/sddlgfact.cxx | 1 + sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 24 ++++++++----------- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 3 +++ sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2 -- sd/source/ui/inc/AccessiblePageShape.hxx | 13 ++++------ .../ui/inc/AccessiblePresentationGraphicShape.hxx | 4 +++- .../ui/inc/AccessiblePresentationOLEShape.hxx | 1 - sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 3 --- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 3 --- sd/source/ui/inc/BezierObjectBar.hxx | 3 ++- sd/source/ui/inc/Client.hxx | 2 -- sd/source/ui/inc/animobjs.hxx | 4 ---- sd/source/ui/inc/annotationmanager.hxx | 5 ++-- sd/source/ui/inc/assclass.hxx | 1 - sd/source/ui/inc/copydlg.hxx | 2 -- sd/source/ui/inc/createtabledesignpanel.hxx | 4 ++++ sd/source/ui/view/sdwindow.cxx | 1 + 22 files changed, 70 insertions(+), 46 deletions(-) diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 67eb50eb2851..a0316591746f 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -83,3 +83,31 @@ blacklist: sd/source/filter/eppt/pptexanimations.hxx: # base class has to be a complete type - memory + sd/source/ui/inc/AccessibleDocumentViewBase.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp + - com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp + - com/sun/star/awt/XFocusListener.hpp + - com/sun/star/awt/XWindowListener.hpp + - com/sun/star/beans/XPropertyChangeListener.hpp + sd/source/ui/inc/AccessibleDrawDocumentView.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessibleGroupPosition.hpp + sd/source/ui/inc/AccessibleSlideSorterObject.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessible.hpp + - com/sun/star/accessibility/XAccessibleComponent.hpp + - com/sun/star/accessibility/XAccessibleContext.hpp + - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp + - com/sun/star/lang/XServiceInfo.hpp + sd/source/ui/inc/AccessibleSlideSorterView.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessible.hpp + - com/sun/star/accessibility/XAccessibleComponent.hpp + - com/sun/star/accessibility/XAccessibleContext.hpp + - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp + - com/sun/star/accessibility/XAccessibleSelection.hpp + - com/sun/star/lang/XServiceInfo.hpp + sd/source/ui/inc/BezierObjectBar.hxx: + # Used via macro, really needed to compile + - class SfxModule diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 470aa565e4ea..b3f570c1193d 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -48,6 +49,11 @@ #include #include #include +#include +#include +#include +#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 355c579d96ce..66450360ca34 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -29,13 +29,14 @@ #include #include #include +#include #include #include #include #include #include - +#include #include #include #include @@ -50,6 +51,7 @@ #include #include #include +#include #include #include diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index f4a4faa0ab7e..482888db9391 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -18,6 +18,7 @@ */ #include +#include #include diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 9a96e14724bb..d40978bcf1d0 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -18,6 +18,7 @@ */ #include +#include #include diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 5481d7533e38..d318528ca594 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -21,6 +21,7 @@ #include "sddlgfact.hxx" #include #include +#include #include #include #include diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 516b4630db89..dfdbdea5690a 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -24,32 +24,28 @@ #include #include #include "AccessibleViewForwarder.hxx" -#include "AccessiblePageShape.hxx" -#include -#include +#include +#include + #include #include #include -#include -#include #include #include -#include "DrawViewShell.hxx" -#include -#include -#include "FrameView.hxx" -#include "PresentationViewShell.hxx" -#include #include -class SdViewShell; + +namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } + +class VclWindowEvent; + namespace sd { class ViewShell; class Window; } -class VclSimpleEvent; - namespace accessibility { /** Base class for the various document views of the Draw and diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 90a64a822967..9b3294fcab8f 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -24,6 +24,9 @@ #include +namespace accessibility { class AccessiblePageShape; } +namespace accessibility { class ChildrenManager; } + namespace accessibility { /** This class makes draw documents in the general view modes diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index b703f8c6d0a0..8bceeae7878d 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -20,11 +20,9 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEOUTLINEEDITSOURCE_HXX #define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEOUTLINEEDITSOURCE_HXX -#include #include #include #include -#include #include #include diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index a7fcaffa053d..f076bb4affd2 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -21,15 +21,10 @@ #define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEPAGESHAPE_HXX #include -#include -#include -#include -#include -#include -#include -#include - -#include + +namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } +namespace accessibility { class AccessibleShapeTreeInfo; } namespace accessibility { diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 40798fd16567..288cda8a169b 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -22,7 +22,9 @@ #include -#include +namespace accessibility { class AccessibleShapeInfo; } +namespace accessibility { class AccessibleShapeTreeInfo; } + namespace accessibility { /** This class makes Impress shapes accessible. diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 5e47295f22ca..9ae951438168 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -22,7 +22,6 @@ #include -#include namespace accessibility { /** This class makes Impress shapes accessible. diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index cdbab94393fc..b1374783f6d5 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -25,11 +25,8 @@ #include #include #include -#include #include -#include #include -#include class SdPage; diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index b706a85989d7..bb50edfe9052 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -28,9 +28,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx index d6aab2bf9747..8d1def00f313 100644 --- a/sd/source/ui/inc/BezierObjectBar.hxx +++ b/sd/source/ui/inc/BezierObjectBar.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_BEZIEROBJECTBAR_HXX #define INCLUDED_SD_SOURCE_UI_INC_BEZIEROBJECTBAR_HXX -#include #include #include +class SfxModule; + namespace sd { class View; diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 0c9febd660b9..408ccd989a9c 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -21,9 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_CLIENT_HXX #include -class SdrGrafObj; class SdrOle2Obj; -class OutlinerParaObject; namespace sd { diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index e2eea1f6193c..24fa0085f5f2 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -23,20 +23,16 @@ #include #include #include -#include #include #include #include -#include -#include #include #include class SdDrawDocument; -class BitmapEx; namespace sd { diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index 423d9c3e57b4..81ed8037f88c 100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_ANNOTATIONMANAGER_HXX #define INCLUDED_SD_SOURCE_UI_INC_ANNOTATIONMANAGER_HXX -#include - #include +class SfxRequest; +class SfxItemSet; + namespace sd { diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 905d20764834..d5d44f29ee84 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX #define INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX -#include #include #include diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 33a97c589943..52a6146c230e 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_COPYDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_COPYDLG_HXX -#include #include -#include #include #include #include diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index 880966846e90..42ae072ea325 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -23,6 +23,10 @@ #include #include +namespace vcl { class Window; } + +class ViewShellBase; + namespace sd { VclPtr createTableDesignPanel (vcl::Window* pParent, ViewShellBase& rBase); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index aa7cdc59de09..cfc5b3f68570 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include -- cgit