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 <vmiklos@collabora.co.uk>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index d0561dc..dbae85a 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 2c83e8c..74f945c 100644
--- a/sd/inc/Annotation.hxx
+++ b/sd/inc/Annotation.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_SD_INC_ANNOTATION_HXX
#include <sal/config.h>
#include <sal/types.h>
#include <memory>
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 <typename > class Reference; } } } }
class SfxViewShell;
namespace sd {
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 32e2b21..7f25e9a 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 bfe1c39..64ab641 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -22,9 +22,6 @@
#include <osl/interlck.h>
#include <cstddef>
#include <new>
#include <sddllapi.h>
namespace sd {
diff --git a/sd/inc/sdpdffilter.hxx b/sd/inc/sdpdffilter.hxx
index 8971eb7..ce085a7 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 <com/sun/star/drawing/XShape.hpp>
#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 9e1c983..5929e73 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -19,6 +19,7 @@
#include <svl/itemset.hxx>
#include <sfx2/new.hxx>
#include <svtools/valueset.hxx>
#include <strings.hrc>
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index 1f6a720..a7bb20b 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 d3ae091..d2f7d87 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 505b0be..59b6635 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -24,7 +24,6 @@
#include <sfx2/objsh.hxx>
#include "DrawDocShell.hxx"
#include <glob.hxx>
#include <pres.hxx>
#include <sddllapi.h>
namespace sd {
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 5dbbd4b..e02f8a5 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 45d8004..bc36226 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 42f0b8d..20770a1 100644
--- a/sd/source/ui/inc/ShellFactory.hxx
+++ b/sd/source/ui/inc/ShellFactory.hxx
@@ -22,12 +22,8 @@
#include <sfx2/toolbarids.hxx>
namespace vcl { class Window; }
namespace sd {
class FrameView;
typedef ToolbarId ShellId;
template<class ShellType>
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 000e751..716353b 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 <vcl/customweld.hxx>
#include <vcl/weld.hxx>
#include <sfx2/basedlgs.hxx>
#include <tools/fract.hxx>
diff --git a/sd/source/ui/inc/createtableobjectbar.hxx b/sd/source/ui/inc/createtableobjectbar.hxx
index 5ed8e43..881ac8e 100644
--- a/sd/source/ui/inc/createtableobjectbar.hxx
+++ b/sd/source/ui/inc/createtableobjectbar.hxx
@@ -22,6 +22,8 @@
#include <sal/config.h>
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 7123b9f..d492951 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 33889a8..e2cbcc8 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -24,7 +24,6 @@
#include <rtl/ustring.hxx>
class SdDrawDocument;
class SdrObject;
namespace sd {
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index b59addc..0a0d23f 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 37742ee..3143401 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 7207377..1e79d6a 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 2360493..2fe25a6 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -22,11 +22,11 @@
#include <vector>
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
#include <svtools/valueset.hxx>
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 63238d5..1894a8c 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -27,6 +27,8 @@
#include <cppcanvas/vclfactory.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
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;
