[Libreoffice-commits] core.git: sd/IwyuFilter_sd.yaml sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Mar 7 13:13:00 UTC 2019 

 sd/IwyuFilter_sd.yaml                                             |   15 ++++
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx         |    8 --
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx         |    9 --
 sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx        |    3 
 sd/source/ui/accessibility/AccessibleOutlineView.cxx              |   19 -----
 sd/source/ui/accessibility/AccessiblePageShape.cxx                |    5 -
 sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx |    1 
 sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx     |    1 
 sd/source/ui/accessibility/AccessiblePresentationShape.cxx        |    1 
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx          |    3 
 sd/source/ui/accessibility/SdShapeTypes.cxx                       |    1 
 sd/source/ui/animations/CustomAnimationDialog.cxx                 |   12 ---
 sd/source/ui/animations/CustomAnimationList.cxx                   |    1 
 sd/source/ui/animations/CustomAnimationList.hxx                   |    3 
 sd/source/ui/animations/CustomAnimationPane.cxx                   |    7 --
 sd/source/ui/animations/CustomAnimationPane.hxx                   |    6 -
 sd/source/ui/animations/SlideTransitionPane.cxx                   |   10 ---
 sd/source/ui/animations/motionpathtag.cxx                         |    4 -
 sd/source/ui/animations/motionpathtag.hxx                         |    2 
 sd/source/ui/annotations/annotationmanager.cxx                    |   15 ----
 sd/source/ui/annotations/annotationtag.cxx                        |   11 ---
 sd/source/ui/annotations/annotationtag.hxx                        |    2 
 sd/source/ui/annotations/annotationwindow.cxx                     |   32 ----------
 sd/source/ui/annotations/annotationwindow.hxx                     |    4 -
 sd/source/ui/app/optsitem.cxx                                     |    3 
 sd/source/ui/app/sddll.cxx                                        |    9 --
 sd/source/ui/app/sdmod.cxx                                        |   11 ---
 sd/source/ui/app/sdmod1.cxx                                       |   19 -----
 sd/source/ui/app/sdmod2.cxx                                       |   12 ---
 sd/source/ui/app/sdpopup.cxx                                      |    5 -
 sd/source/ui/app/sdxfer.cxx                                       |    5 -
 sd/source/ui/app/tmplctrl.cxx                                     |    1 
 sd/source/ui/controller/displaymodecontroller.cxx                 |    1 
 sd/source/ui/controller/slidelayoutcontroller.cxx                 |    9 --
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx                   |    3 
 sd/source/ui/inc/AccessibleSlideSorterView.hxx                    |    3 
 36 files changed, 39 insertions(+), 217 deletions(-)

New commits:
commit 756d7d7073e0542a7b1ae92cb88bada3530e50e9
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sat Mar 2 00:09:30 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 7 14:12:31 2019 +0100

    tdf#42949 Fix IWYU warnings in sd/source/ui/[a-c]*/*cxx
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: I75bb860272e23ebc04912295b0ce4f2c8fe540b7
    Reviewed-on: https://gerrit.libreoffice.org/68604
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index ee20735d14da..dc21a4cb683a 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -69,10 +69,25 @@ blacklist:
     sd/source/filter/eppt/eppt.hxx:
     # base class has to be a complete type
     - escherex.hxx
+    sd/source/ui/animations/CustomAnimationPane.hxx:
+    # Needed for typedef
+    - motionpathtag.hxx
+    sd/source/ui/animations/SlideTransitionPane.cxx:
+    # Avoid loplugin:unreffun error
+    - /createslidetransitionpanel.hxx
+    sd/source/ui/animations/CustomAnimationPane.cxx:
+    # Avoid loplugin:unreffun error
+    - createcustomanimationpanel.hxx
     sd/source/ui/annotations/annotationmanagerimpl.hxx:
     # base class has to be a complete type
     - annotationtag.hxx
     - com/sun/star/document/XEventListener.hpp
+    sd/source/ui/annotations/annotationmanager.cxx:
+    # Needed for unique_ptr type
+    - editeng/outlobj.hxx
+    sd/source/ui/app/sdmod.cxx:
+    # Needed to inherit linker visibility from SdResId declaration
+    - sdresid.hxx
     sd/source/ui/framework/configuration/ConfigurationTracer.hxx:
     # Needed for css shortcut
     - sal/types.h
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 6ebc32ad74e9..7c755100198a 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -18,26 +18,18 @@
  */
 
 #include <AccessibleDocumentViewBase.hxx>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#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>
 
 #include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/unoapi.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <Window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index d7852eb6cda6..0998aec4d612 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -19,29 +19,21 @@
 
 #include <AccessibleDrawDocumentView.hxx>
 #include <com/sun/star/drawing/ShapeCollection.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
 #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 <sal/log.hxx>
-#include <sfx2/viewfrm.hxx>
 
 #include <svx/AccessibleShape.hxx>
 #include <svx/ChildrenManager.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/unoapi.hxx>
-#include <Window.hxx>
 #include <vcl/svapp.hxx>
 
 #include <ViewShell.hxx>
@@ -49,7 +41,6 @@
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
 #include <algorithm>
-#include <sdpage.hxx>
 #include <slideshow.hxx>
 #include <anminfo.hxx>
 #include <AccessiblePageShape.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 0c7736a6680c..030c547dde14 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -20,10 +20,9 @@
 #include <memory>
 #include <editeng/unoedhlp.hxx>
 #include <svx/svdoutl.hxx>
+#include <svx/svdview.hxx>
 
 #include <AccessibleOutlineEditSource.hxx>
-#include <OutlineView.hxx>
-#include <svx/sdrpaintwindow.hxx>
 
 namespace accessibility
 {
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 9e165b4c2686..1039ec950b4d 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -17,28 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <rtl/ustring.h>
-#include <sal/log.hxx>
-#include <sfx2/viewfrm.hxx>
-
-#include <svx/AccessibleShape.hxx>
 
-#include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/unoapi.hxx>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <Window.hxx>
-#include <ViewShell.hxx>
 #include <OutlineViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <OutlineView.hxx>
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 05d97557882f..785e098ad869 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -24,12 +24,7 @@
 #include <tools/gen.hxx>
 #include <sal/log.hxx>
 
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 482888db9391..72f2c3568d50 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -24,7 +24,6 @@
 
 #include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
-#include <rtl/ustring.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index d40978bcf1d0..1cd03785c20e 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -24,7 +24,6 @@
 
 #include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
-#include <rtl/ustring.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 12e95e320194..2d02e2f50bc7 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -25,7 +25,6 @@
 #include <sdresid.hxx>
 #include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
-#include <rtl/ustring.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 401faab3cebf..8a2ad2ee7658 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -28,8 +28,8 @@
 #include <view/SlideSorterView.hxx>
 #include <model/SlideSorterModel.hxx>
 #include <model/SlsPageDescriptor.hxx>
-#include <SlideSorterViewShell.hxx>
 
+#include <ViewShell.hxx>
 #include <ViewShellHint.hxx>
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
@@ -45,6 +45,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index 016f6a4a2df5..a6159b05f7a0 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -22,7 +22,6 @@
 #include <AccessiblePresentationShape.hxx>
 #include <AccessiblePresentationGraphicShape.hxx>
 #include <AccessiblePresentationOLEShape.hxx>
-#include <rtl/ustring.hxx>
 
 namespace accessibility {
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 6581de2a0f05..12bb79851bea 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -29,23 +29,16 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/media/XManager.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 
 #include <memory>
 
 #include <i18nutil/unicode.hxx>
-#include <unotools/pathoptions.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/tabpage.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
@@ -54,15 +47,12 @@
 #include <svtools/ctrltool.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <svx/svxids.hrc>
 #include <editeng/flstitem.hxx>
-#include <svx/drawitem.hxx>
 
 #include <svx/colorbox.hxx>
-#include <svx/xtable.hxx>
 #include <svx/gallery.hxx>
 
-#include <svx/dialogs.hrc>
+#include <editeng/editids.hrc>
 #include <sdresid.hxx>
 
 #include "CustomAnimationDialog.hxx"
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index a3c210d55013..d0910d6bb97c 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include "CustomAnimationList.hxx"
 #include <CustomAnimationPreset.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 25976bc0e437..9b738188c962 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -25,11 +25,12 @@
 #include <memory>
 
 #include <vcl/treelistbox.hxx>
-#include <vcl/builder.hxx>
 #include <CustomAnimationEffect.hxx>
 
 namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 
+class VclBuilder;
+
 namespace sd {
 
 typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 1041ccc8b22d..c666b7a91c71 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <comphelper/processfactory.hxx>
@@ -49,7 +48,6 @@
 #include <vcl/fixed.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/scrbar.hxx>
 
 #include <comphelper/sequence.hxx>
 #include <sfx2/frame.hxx>
@@ -66,7 +64,6 @@
 #include <slideshow.hxx>
 #include <undoanim.hxx>
 #include <optsitem.hxx>
-#include <sddll.hxx>
 #include <sdmod.hxx>
 #include <framework/FrameworkHelper.hxx>
 
@@ -74,14 +71,10 @@
 
 #include <strings.hrc>
 #include <sdpage.hxx>
-#include <drawdoc.hxx>
 #include <app.hrc>
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/range/b2drange.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 9976207d5f75..ce2211eab203 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -22,9 +22,12 @@
 
 #include <vcl/layout.hxx>
 #include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
+#include "CustomAnimationDialog.hxx"
 #include "CustomAnimationList.hxx"
 #include "CategoryListBox.hxx"
+#include "motionpathtag.hxx"
 #include <misc/scopelock.hxx>
 
 #include <vector>
@@ -32,9 +35,7 @@
 namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
 namespace sd { class CustomAnimationPresets; }
-namespace sd { class MotionPathTag; }
 
-class FixedText;
 namespace weld { class ComboBox; }
 
 enum class PathKind { NONE, CURVE, POLYGON, FREEFORM };
@@ -49,7 +50,6 @@ class EventMultiplexerEvent;
 
 namespace sd {
 
-class PropertyControl;
 class STLPropertySet;
 class ViewShellBase;
 
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 4883b1a72287..51dc4fdc692d 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
-
+#include <com/sun/star/drawing/XDrawView.hpp>
 #include <SlideTransitionPane.hxx>
 #include <createslidetransitionpanel.hxx>
 
@@ -32,24 +31,17 @@
 #include <sdpage.hxx>
 #include <filedlg.hxx>
 #include <strings.hrc>
-#include <DrawController.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <EventMultiplexer.hxx>
 
 #include <sal/log.hxx>
-#include <svtools/controldims.hxx>
 #include <svx/gallery.hxx>
-#include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <tools/urlobj.hxx>
-#include <DrawViewShell.hxx>
 #include <slideshow.hxx>
-#include <drawview.hxx>
 #include <sdundogr.hxx>
 #include <undoanim.hxx>
 #include <optsitem.hxx>
-#include <sddll.hxx>
 
 #include <sfx2/sidebar/Theme.hxx>
 
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 1996aec0a02d..0bfcd2dea135 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -26,8 +26,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -48,9 +46,7 @@
 #include "CustomAnimationPane.hxx"
 #include <View.hxx>
 #include "motionpathtag.hxx"
-#include <sdpage.hxx>
 #include <ViewShell.hxx>
-#include <app.hrc>
 #include <Window.hxx>
 
 #include <svx/sdr/contact/viewcontact.hxx>
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index 91604b183121..c670aeeb0e69 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <smarttag.hxx>
-#include <CustomAnimationEffect.hxx>
+#include "CustomAnimationList.hxx"
 
 namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 class SdrPathObj;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index fab298c33de0..bcde3fdb6e5d 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -17,12 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sddll.hxx>
-
-#include <boost/property_tree/json_parser.hpp>
-
-#include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
@@ -36,9 +31,7 @@
 #include <vcl/weld.hxx>
 
 #include <sal/macros.h>
-#include <svl/style.hxx>
 #include <svl/itempool.hxx>
-#include <unotools/datetime.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/syslocale.hxx>
@@ -48,10 +41,8 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/objface.hxx>
 
 #include <editeng/editeng.hxx>
 #include <editeng/eeitem.hxx>
@@ -64,7 +55,6 @@
 #include <editeng/crossedoutitem.hxx>
 
 #include <svx/postattr.hxx>
-#include <svx/svdetc.hxx>
 
 #include <annotationmanager.hxx>
 #include "annotationmanagerimpl.hxx"
@@ -72,14 +62,11 @@
 #include <strings.hrc>
 
 #include <Annotation.hxx>
-#include <ToolBarManager.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
-#include <DrawController.hxx>
 #include <sdresid.hxx>
 #include <EventMultiplexer.hxx>
 #include <ViewShellBase.hxx>
-#include <ViewShellManager.hxx>
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
 #include <textapi.hxx>
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index f0a0c196fcca..643cda7ec5fe 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -17,17 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
+#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/office/XAnnotation.hpp>
 
-#include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/dispatch.hxx>
-
-#include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdr/overlay/overlayanimatedbitmapex.hxx>
 #include <svx/sdr/overlay/overlaybitmapex.hxx>
 #include <svx/svdpagv.hxx>
@@ -41,9 +36,7 @@
 #include "annotationmanagerimpl.hxx"
 #include "annotationwindow.hxx"
 #include "annotationtag.hxx"
-#include <sdpage.hxx>
 #include <ViewShell.hxx>
-#include <app.hrc>
 #include <Window.hxx>
 #include <drawdoc.hxx>
 
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 2f843609ec29..7a62b5b13a06 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONTAG_HXX
 
 #include <smarttag.hxx>
+#include "annotationwindow.hxx"
 
 namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
 
@@ -28,7 +29,6 @@ namespace sd {
 
 class View;
 class AnnotationManagerImpl;
-class AnnotationWindow;
 
 class AnnotationTag final : public SmartTag
 {
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 76a37f8017e9..56d43b7935fc 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -17,63 +17,32 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/fontitem.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/bulletitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/flditem.hxx>
-#include <editeng/frmdir.hxx>
-#include <editeng/frmdiritem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/adjustitem.hxx>
 #include <editeng/editview.hxx>
-#include <svx/svdview.hxx>
-#include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/overlay/overlaymanager.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/langtab.hxx>
-#include <svl/slstitm.hxx>
-#include <unotools/securityoptions.hxx>
 #include <unotools/useroptions.hxx>
-#include <svl/languageoptions.hxx>
-#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 
-#include <linguistic/lngprops.hxx>
-
-#include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include <vcl/vclenum.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/help.hxx>
 #include <vcl/scrbar.hxx>
-#include <vcl/button.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
 
-#include <tools/helpers.hxx>
-
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-
 #include <strings.hrc>
 #include "annotationwindow.hxx"
 #include "annotationmanagerimpl.hxx"
@@ -82,7 +51,6 @@
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
 #include <drawdoc.hxx>
-#include <View.hxx>
 #include <textapi.hxx>
 #include <sdresid.hxx>
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 10e055d01a08..94bf1184ee22 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -22,6 +22,8 @@
 
 #include <vcl/ctrl.hxx>
 #include <vcl/floatwin.hxx>
+#include <svtools/svmedit.hxx>
+#include <vcl/scrbar.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 
@@ -29,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace office { class XAnnot
 
 class OutlinerView;
 class Outliner;
-class ScrollBar;
-class MultiLineEdit;
 class SvxLanguageItem;
 class SdDrawDocument;
 
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 817331e66075..c77e01990245 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -22,13 +22,10 @@
 #include <o3tl/any.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
-#include <sfx2/app.hxx>
 #include <tools/helpers.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
-#include <i18nlangtag/languagetag.hxx>
 
-#include <sdmod.hxx>
 #include <optsitem.hxx>
 #include <FrameView.hxx>
 #include <sdattr.hrc>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index e165ae9ae1a9..8098c5d6c31c 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -21,9 +21,6 @@
 
 #include <avmedia/mediaplayer.hxx>
 #include <avmedia/mediatoolbox.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/editeng.hxx>
-#include <svx/svdobj.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svx/fmobjfac.hxx>
@@ -54,7 +51,6 @@
 #include <SpellDialogChildWindow.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <SlideSorterViewShellBase.hxx>
-#include <strmname.h>
 #include <SdShapeTypes.hxx>
 #include <TextObjectBar.hxx>
 #include <tmplctrl.hxx>
@@ -79,20 +75,15 @@
 #include <svx/pszctrl.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/SvxColorChildWindow.hxx>
-#include <svx/SvxShapeTypes.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/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sfx2/emojipopup.hxx>
 #include <sfx2/charmappopup.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <sdabstdlg.hxx>
 #include <sdfilter.hxx>
 #include <sdmod.hxx>
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index b55213c44ed2..521059b0dafd 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -18,20 +18,13 @@
  */
 
 #include <unotools/pathoptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/status.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/request.hxx>
-#include <svx/pszctrl.hxx>
-#include <svx/zoomctrl.hxx>
-#include <svx/modctrl.hxx>
 #include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/ehdl.hxx>
@@ -40,17 +33,13 @@
 #include <svl/srchitem.hxx>
 #include <svx/svxerr.hxx>
 
-#include <svx/xmlsecctrl.hxx>
 #include <svtools/colorcfg.hxx>
 
-#include <sderror.hxx>
 #include <sdmod.hxx>
 #include <sdresid.hxx>
 #include <optsitem.hxx>
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
-#include <app.hrc>
-#include <strings.hrc>
 #include <errhdl.hrc>
 
 #define ShellClass_SdModule
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 7ee1d57b0bce..42bde350851f 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -23,48 +23,31 @@
 #include <unotools/moduleoptions.hxx>
 #include <framework/FrameworkHelper.hxx>
 
-#include <svx/dialogs.hrc>
 #include <vcl/errinf.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/editdata.hxx>
 #include <vcl/weld.hxx>
-#include <editeng/svxenum.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/templatedlg.hxx>
-#include <editeng/paperinf.hxx>
 #include <editeng/eeitem.hxx>
-#include <unotools/useroptions.hxx>
-#include <com/sun/star/uno/Sequence.h>
 
-#include <app.hrc>
+#include <svx/svxids.hrc>
 #include <strings.hrc>
 
 #include <sdmod.hxx>
 #include <pres.hxx>
 #include <optsitem.hxx>
 #include <ViewShell.hxx>
-#include <sdattr.hxx>
-#include <sdpage.hxx>
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
-#include <assclass.hxx>
-#include <sdenumdef.hxx>
 #include <sdresid.hxx>
 #include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShellBase.hxx>
-#include <FrameView.hxx>
 #include <FactoryIds.hxx>
-#include <sdabstdlg.hxx>
 #include <memory>
 #include <slideshow.hxx>
 
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
-
 using ::sd::framework::FrameworkHelper;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 5fd4dc940116..4fd801e92b5f 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/CustomPropertyField.hxx>
 #include <sfx2/printer.hxx>
@@ -29,42 +28,35 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/request.hxx>
 
 #include <editeng/measfld.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/editeng.hxx>
 
+#include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <svx/svdotext.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdopage.hxx>
 
 #include <sfx2/sfxdlg.hxx>
 
-#include <svx/sdr/contact/displayinfo.hxx>
-
 #include <sdmod.hxx>
 #include <app.hrc>
 #include <family.hrc>
 #include <strings.hrc>
+#include <sdattr.hrc>
 
 #include <bitmaps.hlst>
 #include <ViewShell.hxx>
 #include <FrameView.hxx>
-#include <sdattr.hxx>
 #include <optsitem.hxx>
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
 #include <Outliner.hxx>
 #include <sdresid.hxx>
 #include <pres.hxx>
-#include <DrawViewShell.hxx>
 #include <OutlineViewShell.hxx>
 #include <OutlineView.hxx>
 #include <ViewShellBase.hxx>
 #include <sdpage.hxx>
-#include <sdxfer.hxx>
 #include <sdabstdlg.hxx>
 #include <svl/intitem.hxx>
 
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 08a1c06db958..89cf3ea5a4b8 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -17,11 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/eeitem.hxx>
-
-#include <editeng/editeng.hxx>
 #include <editeng/flditem.hxx>
-#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/useroptions.hxx>
@@ -30,7 +26,6 @@
 #include <sdpopup.hxx>
 #include <sdresid.hxx>
 #include <sdmod.hxx>
-#include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 
 /*
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 99d7050e2888..29e85fa9d2e7 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -24,22 +24,18 @@
 #include <comphelper/fileformat.h>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svdpagv.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/outlobj.hxx>
 #include <sot/storage.hxx>
-#include <svl/itempool.hxx>
 #include <editeng/editobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <sot/formats.hxx>
 #include <svl/urlbmk.hxx>
-#include <editeng/outliner.hxx>
 
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -56,7 +52,6 @@
 #include <View.hxx>
 #include <sdmod.hxx>
 #include <sdpage.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <stlpool.hxx>
 #include <imapinfo.hxx>
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 295eafc48eba..c338ed158c5f 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/menu.hxx>
 #include <vcl/status.hxx>
-#include <svl/style.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index c59deef62de7..4bcb517189b4 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <memory>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/valueset.hxx>
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 27d597b2172f..05e1dc67e5a5 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -18,38 +18,29 @@
  */
 
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/DrawViewMode.hpp>
 
 #include <vcl/commandinfoprovider.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 
 #include <svl/languageoptions.hxx>
 
-#include <svtools/ctrltool.hxx>
-#include <svtools/ctrlbox.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/valueset.hxx>
 
 #include <xmloff/autolayout.hxx>
 
-#include <app.hrc>
-#include <facreg.hxx>
 #include <strings.hrc>
 
 #include <bitmaps.hlst>
 #include <sdresid.hxx>
-#include <pres.hxx>
 #include "slidelayoutcontroller.hxx"
-#include <ViewShellBase.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::beans;
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 2ad10b77aac6..ee2acf119ce4 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -35,6 +35,8 @@
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
 
+#include "Window.hxx"
+
 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; } } } }
@@ -43,7 +45,6 @@ class VclWindowEvent;
 
 namespace sd {
 class ViewShell;
-class Window;
 }
 
 namespace accessibility {
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index bb50edfe9052..b2278a20ac47 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -29,11 +29,10 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
 
 #include <memory>
 
-namespace vcl { class Window; }
-
 namespace sd { namespace slidesorter {
 class SlideSorter;
 } }

More information about the Libreoffice-commits mailing list