summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-06-08 01:16:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-06-08 09:13:09 +0200
commitbff31df1398b81c0348aebae2c346474724c4884 (patch)
tree8910c6716919d5ae7dfc7f41173e0025ae254e39
parentf81714d8e70569506bd10cffc9dc6c18d7c6966f (diff)
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 <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sd/IwyuFilter_sd.yaml28
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx1
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx1
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx1
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx24
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx3
-rw-r--r--sd/source/ui/inc/AccessibleOutlineEditSource.hxx2
-rw-r--r--sd/source/ui/inc/AccessiblePageShape.hxx13
-rw-r--r--sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx4
-rw-r--r--sd/source/ui/inc/AccessiblePresentationOLEShape.hxx1
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx3
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx3
-rw-r--r--sd/source/ui/inc/BezierObjectBar.hxx3
-rw-r--r--sd/source/ui/inc/Client.hxx2
-rw-r--r--sd/source/ui/inc/animobjs.hxx4
-rw-r--r--sd/source/ui/inc/annotationmanager.hxx5
-rw-r--r--sd/source/ui/inc/assclass.hxx1
-rw-r--r--sd/source/ui/inc/copydlg.hxx2
-rw-r--r--sd/source/ui/inc/createtabledesignpanel.hxx4
-rw-r--r--sd/source/ui/view/sdwindow.cxx1
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 <rtl/ustring.h>
#include <sfx2/viewfrm.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <sfx2/objsh.hxx>
#include <svx/AccessibleShape.hxx>
@@ -48,6 +49,11 @@
#include <svtools/colorcfg.hxx>
#include <ViewShell.hxx>
#include <View.hxx>
+#include <drawdoc.hxx>
+#include <editeng/outlobj.hxx>
+#include <sdpage.hxx>
+#include <DrawViewShell.hxx>
+#include <PresentationViewShell.hxx>
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 <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/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.h>
#include <sfx2/viewfrm.hxx>
#include <svx/AccessibleShape.hxx>
-
+#include <svx/ChildrenManager.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdmodel.hxx>
#include <svx/unoapi.hxx>
@@ -50,6 +51,7 @@
#include <sdpage.hxx>
#include <slideshow.hxx>
#include <anminfo.hxx>
+#include <AccessiblePageShape.hxx>
#include <strings.hrc>
#include <sdresid.hxx>
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 <AccessiblePresentationGraphicShape.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <SdShapeTypes.hxx>
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 <AccessiblePresentationOLEShape.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <SdShapeTypes.hxx>
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 <BreakDlg.hxx>
#include <copydlg.hxx>
+#include <svx/xtable.hxx>
#include <custsdlg.hxx>
#include <dlg_char.hxx>
#include <dlgpage.hxx>
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 <editeng/AccessibleComponentBase.hxx>
#include <editeng/AccessibleSelectionBase.hxx>
#include "AccessibleViewForwarder.hxx"
-#include "AccessiblePageShape.hxx"
-#include <svx/ChildrenManager.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+#include <svx/AccessibleShapeTreeInfo.hxx>
+#include <svx/IAccessibleViewForwarderListener.hxx>
+
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <tools/link.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-#include "DrawViewShell.hxx"
-#include <sdpage.hxx>
-#include <drawdoc.hxx>
-#include "FrameView.hxx"
-#include "PresentationViewShell.hxx"
-#include <editeng/outlobj.hxx>
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
-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 <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
+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 <vcl/svapp.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svl/lstner.hxx>
#include <editeng/unoedsrc.hxx>
-#include <editeng/editdata.hxx>
#include <editeng/unoforou.hxx>
#include <editeng/unoviwou.hxx>
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 <svx/AccessibleShape.hxx>
-#include <svx/AccessibleShapeTreeInfo.hxx>
-#include <svx/IAccessibleViewForwarderListener.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-
-#include <svx/AccessibleTextHelper.hxx>
+
+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 <svx/AccessibleGraphicShape.hxx>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
+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 <svx/AccessibleOLEShape.hxx>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
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 <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/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
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 <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
#include <vcl/vclptr.hxx>
#include <memory>
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 <sfx2/module.hxx>
#include <sfx2/shell.hxx>
#include <glob.hxx>
+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 <sfx2/ipclient.hxx>
-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 <sfx2/dockwin.hxx>
#include <vcl/fixed.hxx>
#include <tools/fract.hxx>
-#include <vcl/group.hxx>
#include <sfx2/ctrlitem.hxx>
#include <vcl/button.hxx>
#include <vcl/field.hxx>
-#include <svx/dlgctrl.hxx>
-#include <sfx2/progress.hxx>
#include <vcl/lstbox.hxx>
#include <misc/scopelock.hxx>
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 <com/sun/star/office/XAnnotationAccess.hpp>
-
#include <rtl/ref.hxx>
+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 <vector>
#include <memory>
#include <sddllapi.h>
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 <vcl/group.hxx>
#include <vcl/button.hxx>
-#include <svx/dlgctrl.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <sfx2/basedlgs.hxx>
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 <sal/config.h>
#include <vcl/vclptr.hxx>
+namespace vcl { class Window; }
+
+class ViewShellBase;
+
namespace sd {
VclPtr<vcl::Window> 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 <app.hrc>
#include <ViewShell.hxx>
#include <DrawViewShell.hxx>
+#include <PresentationViewShell.hxx>
#include <View.hxx>
#include <FrameView.hxx>
#include <OutlineViewShell.hxx>