From a2f7678171618d958e3c387718cd389bea63eaeb Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 23 Oct 2018 10:37:52 +0200 Subject: tdf#42949 Fix IWYU warnings in sd/inc ; sd/source/ui/inc/ Found with bin/find-unneeded-includes after recent improvements - remove UNO headers from blacklist - remove newly found unneeded fw declarations - fix up some not self contained headers Change-Id: Ib262e361b62162d96ce8308500b1a41a971353df Reviewed-on: https://gerrit.libreoffice.org/62258 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sd/IwyuFilter_sd.yaml | 10 ---------- sd/inc/Annotation.hxx | 4 ++++ sd/inc/Outliner.hxx | 5 ----- sd/inc/helper/simplereferencecomponent.hxx | 3 --- sd/inc/sdpdffilter.hxx | 8 ++++++-- sd/source/ui/dlg/sdpreslt.cxx | 1 + sd/source/ui/inc/ClientView.hxx | 2 -- sd/source/ui/inc/FormShellManager.hxx | 1 + sd/source/ui/inc/GraphicDocShell.hxx | 1 - sd/source/ui/inc/OutlineView.hxx | 1 - sd/source/ui/inc/Ruler.hxx | 1 - sd/source/ui/inc/ShellFactory.hxx | 4 ---- sd/source/ui/inc/copydlg.hxx | 2 -- sd/source/ui/inc/createtableobjectbar.hxx | 2 ++ sd/source/ui/inc/facreg.hxx | 1 - sd/source/ui/inc/fuconcs.hxx | 1 - sd/source/ui/inc/fuconrec.hxx | 1 - sd/source/ui/inc/fuoltext.hxx | 2 -- sd/source/ui/inc/fupoor.hxx | 1 - sd/source/ui/inc/sdpreslt.hxx | 4 ++-- sd/source/ui/presenter/PresenterPreviewCache.cxx | 2 ++ 21 files changed, 18 insertions(+), 39 deletions(-) diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index d0561dc6eb15..dbae85a63152 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -1,15 +1,6 @@ --- assumeFilename: sd/source/core/drawdoc.cxx blacklist: - sd/inc/createpresentation.hxx: - # base class has to be a complete type - - com/sun/star/uno/Reference.hxx - sd/inc/createunopageimpl.hxx: - # base class has to be a complete type - - com/sun/star/uno/Reference.hxx - sd/inc/createunocustomshow.hxx: - # base class has to be a complete type - - com/sun/star/uno/Reference.hxx sd/inc/CustomAnimationCloner.hxx: # base class has to be a complete type - com/sun/star/animations/XAnimationNode.hpp @@ -50,7 +41,6 @@ blacklist: - com/sun/star/container/XNamed.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XSingleServiceFactory.hpp - - com/sun/star/uno/Any.hxx sd/inc/stlpool.hxx: # base class has to be a complete type - com/sun/star/lang/XServiceInfo.hpp diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx index 2c83e8cb9135..74f945c6216e 100644 --- a/sd/inc/Annotation.hxx +++ b/sd/inc/Annotation.hxx @@ -21,6 +21,8 @@ #define INCLUDED_SD_INC_ANNOTATION_HXX #include +#include +#include class SdPage; class SdrUndoAction; @@ -29,6 +31,8 @@ namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } } +namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } + class SfxViewShell; namespace sd { diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 32e2b21cfa88..7f25e9a0fcf4 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -30,11 +30,6 @@ class SdrObject; class SdrTextObj; class SdDrawDocument; -namespace weld -{ -class MessageDialog; -} - namespace sd { class View; diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index bfe1c391535a..64ab641fc6bc 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -22,9 +22,6 @@ #include -#include -#include - #include namespace sd { diff --git a/sd/inc/sdpdffilter.hxx b/sd/inc/sdpdffilter.hxx index 8971eb745179..ce085a7036b3 100644 --- a/sd/inc/sdpdffilter.hxx +++ b/sd/inc/sdpdffilter.hxx @@ -20,10 +20,14 @@ #ifndef INCLUDED_SD_INC_SDPDFIUMFILTER_HXX #define INCLUDED_SD_INC_SDPDFIUMFILTER_HXX -#include - #include "sdfilter.hxx" +class SfxMedium; +namespace sd +{ +class DrawDocShell; +} + class SdPdfFilter : public SdFilter { public: diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 9e1c983c6070..5929e734a0fc 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -19,6 +19,7 @@ #include #include +#include #include diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 1f6a720907a9..a7bb20b51bf2 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -24,8 +24,6 @@ namespace sd { -class DrawViewShell; - /** * The SdClientView is used for DrawDocShell::Draw() */ diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index d3ae091fa7cb..d2f7d879c1b1 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -28,6 +28,7 @@ class VclWindowEvent; class FmFormShell; +namespace vcl { class Window; } namespace sd { namespace tools { class EventMultiplexerEvent; } } diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 505b0bee7271..59b6635000d3 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -24,7 +24,6 @@ #include #include "DrawDocShell.hxx" #include -#include #include namespace sd { diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 5dbbd4bc53a0..e02f8a5516ab 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -42,7 +42,6 @@ namespace sd { class DrawDocShell; class OutlineViewShell; class OutlineViewModelChangeGuard; -class DrawDocShell; static const int MAX_OUTLINERVIEWS = 4; diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 45d800458493..bc36226b3e83 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -26,7 +26,6 @@ namespace sd { class DrawViewShell; class RulerCtrlItem; -class View; class Window; class Ruler final diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 42f0b8d9e6f2..20770a1897c0 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -22,12 +22,8 @@ #include -namespace vcl { class Window; } - namespace sd { -class FrameView; - typedef ToolbarId ShellId; template diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 000e75151d03..716353b6b535 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_COPYDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_COPYDLG_HXX -#include -#include #include #include diff --git a/sd/source/ui/inc/createtableobjectbar.hxx b/sd/source/ui/inc/createtableobjectbar.hxx index 5ed8e4393ca5..881ac8e07e61 100644 --- a/sd/source/ui/inc/createtableobjectbar.hxx +++ b/sd/source/ui/inc/createtableobjectbar.hxx @@ -22,6 +22,8 @@ #include +class SfxShell; + namespace sd { class View; class ViewShell; diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx index 7123b9f10315..d49295133d34 100644 --- a/sd/source/ui/inc/facreg.hxx +++ b/sd/source/ui/inc/facreg.hxx @@ -25,7 +25,6 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } - namespace uno { class XComponentContext; } } } } css::uno::Reference< css::uno::XInterface > SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index 33889a8bae0b..e2cbcc868070 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -24,7 +24,6 @@ #include class SdDrawDocument; -class SdrObject; namespace sd { diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index b59addc97ae9..0a0d23fedd50 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -23,7 +23,6 @@ #include "fuconstr.hxx" class SdDrawDocument; -class SdrObject; class SfxItemSet; namespace sd { diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 37742eeb6ab6..3143401e90b9 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -25,8 +25,6 @@ class SdDrawDocument; class SfxRequest; -namespace vcl { class Window; } - namespace sd { class View; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 720737743db0..1e79d6a6336b 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -30,7 +30,6 @@ class SdDrawDocument; class SfxRequest; -class SdrObject; class CommandEvent; class HelpEvent; class KeyEvent; diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 2360493a0a0a..2fe25a632bb0 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -22,11 +22,11 @@ #include -#include #include -#include class SfxItemSet; +class SvtValueSet; +namespace weld { class CustomWeld; } namespace sd { class DrawDocShell; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 63238d56904a..1894a8cdd25c 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -27,6 +27,8 @@ #include #include +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::cache; -- cgit v1.2.3