tdf#42949 Fix IWYU warnings in sd/source/ui/[s-u]*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Cleaned subdirs: sidebar, slideshow, slidesorter, table, unoidl
Change-Id: Iae3b8b2581b6a07dad24b4d2d59ffae24f882fe3
Reviewed-on: https://gerrit.libreoffice.org/65913
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index b9675be..8706f41 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -260,3 +260,52 @@ blacklist:
sd/source/ui/remotecontrol/Listener.hxx:
# base class has to be a complete type
- com/sun/star/presentation/XSlideShowListener.hpp
sd/source/ui/sidebar/PanelFactory.hxx:
# base class has to be a complete type
- com/sun/star/ui/XUIElementFactory.hpp
sd/source/ui/slideshow/slideshowimpl.hxx:
# base class has to be a complete type
- com/sun/star/presentation/XShapeEventListener.hpp
- com/sun/star/presentation/XSlideShowController.hpp
- com/sun/star/presentation/XSlideShowListener.hpp
sd/source/ui/slideshow/slideshowviewimpl.hxx:
# base class has to be a complete type
- com/sun/star/awt/XPaintListener.hpp
- com/sun/star/awt/XWindowListener.hpp
- com/sun/star/presentation/XSlideShowView.hpp
- com/sun/star/util/XModifyListener.hpp
sd/source/ui/slidesorter/controller/SlsListener.hxx:
# base class has to be a complete type
- com/sun/star/document/XEventListener.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
- com/sun/star/accessibility/XAccessibleEventListener.hpp
- com/sun/star/frame/XFrameActionListener.hpp
sd/source/ui/slidesorter/shell/SlideSorterService.hxx:
# base class has to be a complete type
- com/sun/star/awt/XWindowListener.hpp
- com/sun/star/drawing/XSlideSorterBase.hpp
- com/sun/star/lang/XInitialization.hpp
sd/source/ui/unoidl/sddetect.hxx:
# base class has to be a complete type
- com/sun/star/document/XExtendedFilterDetection.hpp
- com/sun/star/lang/XServiceInfo.hpp
sd/source/ui/unoidl/unolayer.hxx:
# base class has to be a complete type
- com/sun/star/drawing/XLayer.hpp
- com/sun/star/drawing/XLayerManager.hpp
sd/source/ui/unoidl/unocpres.hxx:
# base class has to be a complete type
- com/sun/star/container/XIndexContainer.hpp
- com/sun/star/container/XNameContainer.hpp
- com/sun/star/container/XNamed.hpp
- com/sun/star/lang/XComponent.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XSingleServiceFactory.hpp
- com/sun/star/lang/XUnoTunnel.hpp
sd/source/ui/unoidl/unopback.hxx:
# base class has to be a complete type
- com/sun/star/beans/XPropertySet.hpp
- com/sun/star/beans/XPropertyState.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index b5f2c0c..b357915 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -24,10 +24,6 @@
#include <memory>
namespace sd {
class TemplateEntry;
}
namespace sd { namespace sidebar {
/** Show a list of all available master pages so that the user can assign
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index c9e4b80..0307268 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -24,6 +24,7 @@
#include <drawdoc.hxx>
#include <sdpage.hxx>
#include "MasterPageContainer.hxx"
#include "MasterPageContainerProviders.hxx"
#include "MasterPageDescriptor.hxx"
#include <EventMultiplexer.hxx>
#include <app.hrc>
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index d4a7a4f..6484660 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_CURRENTMASTERPAGESSELECTOR_HXX
#include "MasterPagesSelector.hxx"
#include <com/sun/star/lang/XComponent.hpp>
namespace sd { namespace tools { class EventMultiplexerEvent; } }
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index 8b32eec..7628498 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -20,7 +20,8 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_CUSTOMANIMATIONPANEL_HXX
#include "PanelBase.hxx"
#include <sfx2/sidebar/ControlFactory.hxx>
namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx
index ee4424f..6099466 100644
--- a/sd/source/ui/sidebar/IDisposable.hxx
+++ b/sd/source/ui/sidebar/IDisposable.hxx
@@ -19,11 +19,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
#include <tools/gen.hxx>
#include <sal/types.h>
namespace vcl { class Window; }
namespace sd { namespace sidebar {
class IDisposable
diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx
index 4e6b8de..94af110 100644
--- a/sd/source/ui/sidebar/ISidebarReceiver.hxx
+++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
#include <com/sun/star/ui/XSidebar.hpp>
namespace sd { namespace sidebar {
class ISidebarReceiver
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 19de3c9..d7072e3 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -20,24 +20,15 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_LAYOUTMENU_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_LAYOUTMENU_HXX
#include "IDisposable.hxx"
#include "ISidebarReceiver.hxx"
#include <sfx2/sidebar/ILayoutableWindow.hxx>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <glob.hxx>
#include <pres.hxx>
#include <vcl/ctrl.hxx>
#include <svtools/valueset.hxx>
#include <vcl/transfer.hxx>
#include <sfx2/shell.hxx>
#include <xmloff/autolayout.hxx>
#include <com/sun/star/ui/XSidebar.hpp>
class SfxModule;
namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
namespace sd {
@@ -51,9 +42,6 @@ class EventMultiplexerEvent;
namespace sd { namespace sidebar {
class ControlFactory;
class SidebarViewShell;
class LayoutMenu
: public ValueSet,
public DragSourceHelper,
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index abee11f..1368400 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -19,11 +19,14 @@
#include "MasterPageContainer.hxx"
#include "MasterPageContainerProviders.hxx"
#include "MasterPageDescriptor.hxx"
#include "MasterPageContainerFiller.hxx"
#include "MasterPageContainerQueue.hxx"
#include <TemplateScanner.hxx>
#include <PreviewRenderer.hxx>
#include <tools/AsynchronousTask.hxx>
#include <tools/SdGlobalResourceContainer.hxx>
#include <strings.hrc>
#include <algorithm>
#include <list>
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 1fa6284..107622c 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -20,12 +20,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_MASTERPAGECONTAINER_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_MASTERPAGECONTAINER_HXX
#include "MasterPageContainerProviders.hxx"
#include <vcl/image.hxx>
#include <PreviewRenderer.hxx>
#include <vcl/timer.hxx>
#include <tools/SdGlobalResourceContainer.hxx>
#include <memory>
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index fce6798..2655fad 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -18,8 +18,10 @@
*/
#include "MasterPageContainerQueue.hxx"
#include "MasterPageContainerProviders.hxx"
#include <tools/IdleDetection.hxx>
#include <PreviewRenderer.hxx>
#include <set>
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 7857fd4..e65c289 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -23,6 +23,8 @@
#include "MasterPageContainer.hxx"
#include "MasterPageDescriptor.hxx"
#include <vcl/timer.hxx>
#include <memory>
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 2f87f3d..f07235d 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -19,8 +19,10 @@
#include <memory>
#include "MasterPageDescriptor.hxx"
#include "MasterPageContainerProviders.hxx"
#include "DocumentHelper.hxx"
#include <PreviewRenderer.hxx>
#include <sdpage.hxx>
#include <tools/urlobj.hxx>
#include <sal/log.hxx>
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 9355c2a..c20ced5 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -23,6 +23,9 @@
#include "MasterPageContainer.hxx"
#include <memory>
namespace sd { class PreviewRenderer; }
class SdDrawDocument;
namespace sd { namespace sidebar {
class PageObjectProvider;
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 55b0acd..744e789 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -24,19 +24,11 @@
#include "MasterPageContainer.hxx"
#include <SlideSorterViewShell.hxx>
#include "PreviewValueSet.hxx"
#include "ISidebarReceiver.hxx"
#include <sfx2/sidebar/ILayoutableWindow.hxx>
#include <pres.hxx>
#include <sfx2/shell.hxx>
#include <vcl/image.hxx>
#include <glob.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/ui/XSidebar.hpp>
#include <queue>
namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
class MouseEvent;
class SdDrawDocument;
class SdPage;
@@ -47,8 +39,6 @@ class ViewShellBase;
namespace sd { namespace sidebar {
class PreviewValueSet;
/** Base class of a menu that lets the user select from a list of
templates or designs that are loaded from files.
*/
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 8adc330..2714303 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -21,6 +21,7 @@
#include <ViewShellBase.hxx>
#include <sfx2/sidebar/Theme.hxx>
#include <navigatr.hxx>
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index bd85159..76d7f27 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -21,8 +21,8 @@
#include <sfx2/sidebar/ILayoutableWindow.hxx>
#include <vcl/ctrl.hxx>
#include <navigatr.hxx>
class SdNavigatorWin;
class SfxBindings;
namespace sd { class ViewShellBase; }
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index 9d28cec..2ffbe36 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -25,8 +25,6 @@
#include <vcl/ctrl.hxx>
#include <memory>
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 0eee16f..e42fc64 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -21,19 +21,8 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx>
#include <framework/Pane.hxx>
#include <com/sun/star/ui/XUIElementFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <map>
#include <memory>
namespace sd {
class ViewShellBase;
}
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index dce1e79..2df1980 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -18,6 +18,7 @@
*/
#include "RecentlyUsedMasterPages.hxx"
#include "MasterPageContainerProviders.hxx"
#include <MasterPageObserver.hxx>
#include "MasterPagesSelector.hxx"
#include "MasterPageDescriptor.hxx"
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 88411a8..830da53 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -22,12 +22,9 @@
#include <tools/SdGlobalResourceContainer.hxx>
#include <tools/link.hxx>
#include <vcl/image.hxx>
#include <vector>
#include <DrawDocShell.hxx>
#include "MasterPageContainer.hxx"
#include <com/sun/star/uno/XInterface.hpp>
namespace sd {
class MasterPageObserverEvent;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index d1c7bdcd..df83c5e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -71,6 +71,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/sizeitem.hxx>
#include <svl/itemset.hxx>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 136e8cb..59adf72 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -21,34 +21,27 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_SLIDEBACKGROUND_HXX
#include <memory>
#include <vcl/ctrl.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/field.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <svx/pagectrl.hxx>
#include <ViewShellBase.hxx>
#include <svx/itemwin.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <com/sun/star/drawing/XDrawView.hpp>
#include <fupage.hxx>
#include <editeng/sizeitem.hxx>
#include <svx/papersizelistbox.hxx>
#include <svx/rulritem.hxx>
#include <svx/xflclit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xflgrit.hxx>
#include <svx/xbitmap.hxx>
#include <svx/xflbckit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xflhtit.hxx>
#include <EventMultiplexer.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
namespace sd { class ViewShellBase; }
namespace sd { namespace tools { class EventMultiplexerEvent; } }
class SvxColorListBox;
class SvxPageItem;
class SvxLongLRSpaceItem;
class SvxLongULSpaceItem;
class XFillColorItem;
class XGradient;
class XFillGradientItem;
class XFillBitmapItem;
class XFillHatchItem;
static const long MINBODY = 284;
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index 256bc37..bf5af52 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -20,7 +20,8 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_SLIDETRANSITIONPANEL_HXX
#include "PanelBase.hxx"
#include <sfx2/sidebar/ControlFactory.hxx>
namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx
index f96f0f8..9063f0e 100644
--- a/sd/source/ui/slideshow/PaneHider.hxx
+++ b/sd/source/ui/slideshow/PaneHider.hxx
@@ -20,8 +20,10 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESHOW_PANEHIDER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESHOW_PANEHIDER_HXX
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
namespace sd {
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 995d332..597f30d 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -18,6 +18,8 @@
*/
#include <DrawController.hxx>
#include <ViewShellBase.hxx>
#include <slideshow.hxx>
#include "SlideShowRestarter.hxx"
#include <framework/ConfigurationController.hxx>
#include <framework/FrameworkHelper.hxx>
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 4f2123e..9cadc0a 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -20,12 +20,15 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWRESTARTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWRESTARTER_HXX
#include <slideshow.hxx>
#include <ViewShellBase.hxx>
#include <rtl/ref.hxx>
#include <tools/link.hxx>
#include <memory>
namespace sd { class SlideShow; }
namespace sd { class ViewShellBase; }
class SfxDispatcher;
struct ImplSVEvent;
namespace sd {
/** This class is used when a display is removed or added to restart the
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 69c6141..153edd8 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/awt/Key.hpp>
#include "showwindow.hxx"
#include "slideshowimpl.hxx"
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
@@ -27,6 +28,7 @@
#include <slideshow.hxx>
#include <ViewShell.hxx>
#include <ViewShellBase.hxx>
#include <sdresid.hxx>
#include <helpids.h>
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index 80f8d14..fc49a95 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -27,8 +27,6 @@
#include <Window.hxx>
#include "slideshowimpl.hxx"
namespace sd {
class SlideshowImpl;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index dac5103..5bf3202 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -31,6 +31,7 @@
#include <svx/svdpool.hxx>
#include <svl/itemprop.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/unoprov.hxx>
@@ -43,13 +44,19 @@
#include <slideshow.hxx>
#include "slideshowimpl.hxx"
#include <sdattr.hrc>
#include <sdmod.hxx>
#include <FactoryIds.hxx>
#include <DrawDocShell.hxx>
#include <ViewShell.hxx>
#include <ViewShellBase.hxx>
#include "SlideShowRestarter.hxx"
#include <DrawController.hxx>
#include <PresentationViewShell.hxx>
#include <customshowlist.hxx>
#include <unopage.hxx>
#include <sdpage.hxx>
#include <cusshow.hxx>
#include <optsitem.hxx>
using ::com::sun::star::presentation::XSlideShowController;
using ::sd::framework::FrameworkHelper;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 5504729..cddf9e4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -39,11 +39,14 @@
#include <com/sun/star/presentation/SlideShow.hpp>
#include <svl/aeitem.hxx>
#include <svl/urihelper.hxx>
#include <unotools/saveopt.hxx>
#include <basic/sbstar.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
#include <svx/unoapi.hxx>
@@ -56,6 +59,7 @@
#include <svx/bmpmask.hxx>
#include <svx/srchdlg.hxx>
#include <svx/hyperdlg.hxx>
#include <svx/svxids.hrc>
#include <AnimationChildWindow.hxx>
#include <notifydocumentevent.hxx>
#include "slideshowimpl.hxx"
@@ -76,10 +80,17 @@
#include <canvas/elapsedtime.hxx>
#include <avmedia/mediawindow.hxx>
#include <svtools/colrdlg.hxx>
#include <DrawDocShell.hxx>
#include <ViewShellBase.hxx>
#include <PresentationViewShell.hxx>
#include <RemoteServer.hxx>
#include <customshowlist.hxx>
#include <unopage.hxx>
#include <sdpage.hxx>
#include <sdmod.hxx>
#include <app.hrc>
#include <cusshow.hxx>
#include <optsitem.hxx>
#define CM_SLIDES 21
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index e8daa04..d40c7c4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -22,69 +22,36 @@
#include <memory>
#include <sal/config.h>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propertysetmixin.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/awt/XActivateListener.hpp>
#include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/ClickAction.hpp>
#include <com/sun/star/presentation/XSlideShowListener.hpp>
#include <com/sun/star/presentation/XSlideShowController.hpp>
#include <com/sun/star/presentation/XShapeEventListener.hpp>
#include <com/sun/star/awt/WindowEvent.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/XPointer.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/presentation/ClickAction.hpp>
#include <com/sun/star/media/XManager.hpp>
#include <com/sun/star/media/XPlayer.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/utils/canvastools.hxx>
#include <vcl/help.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/saveopt.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <basic/sbstar.hxx>
#include <svx/svdpagv.hxx>
#include <svx/fmshell.hxx>
#include <svx/svxids.hrc>
#include <sdmod.hxx>
#include <cusshow.hxx>
#include <ViewShellBase.hxx>
#include <PresentationViewShell.hxx>
#include <ViewShell.hxx>
#include <drawview.hxx>
#include <drawdoc.hxx>
#include "showwindow.hxx"
#include <optsitem.hxx>
#include <FrameView.hxx>
#include <DrawDocShell.hxx>
#include <app.hrc>
#include <slideshow.hxx>
namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
namespace com { namespace sun { namespace star { namespace media { class XPlayer; } } } }
namespace sd { class DrawDocShell; }
namespace sd { class ViewShell; }
class SfxBindings;
class SfxDispatcher;
class SfxViewFrame;
class SfxRequest;
class StarBASIC;
namespace sd
{
class SlideShowView;
class AnimationSlideController;
class PaneHider;
class ShowWindow;
struct PresentationSettingsEx : public PresentationSettings
{
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index d4fa97c..dc14d57 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -20,17 +20,23 @@
#include "slideshowviewimpl.hxx"
#include "slideshowimpl.hxx"
#include <sdpage.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/awt/Pointer.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <cppcanvas/vclfactory.hxx>
#include <cppcanvas/basegfxfactory.hxx>
#include <basegfx/utils/canvastools.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index dbf8e7e..46ba90d 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -24,44 +24,21 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/listenernotification.hxx>
#include <com/sun/star/awt/WindowEvent.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/XPointer.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/utils/canvastools.hxx>
#include <cppcanvas/spritecanvas.hxx>
#include <vcl/help.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/saveopt.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <basic/sbstar.hxx>
#include <svx/svdpagv.hxx>
#include <svx/fmshell.hxx>
#include <tools/gen.hxx>
#include <svx/svxids.hrc>
#include <sdmod.hxx>
#include <cusshow.hxx>
#include <ViewShellBase.hxx>
#include <PresentationViewShell.hxx>
#include <ViewShell.hxx>
#include <drawview.hxx>
#include <slideshow.hxx>
#include <drawdoc.hxx>
#include "showwindow.hxx"
#include <optsitem.hxx>
#include <FrameView.hxx>
#include <DrawDocShell.hxx>
#include <app.hrc>
namespace com { namespace sun { namespace star { namespace awt { class XPointer; } } } }
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
namespace com { namespace sun { namespace star { namespace awt { class XWindowPeer; } } } }
namespace com { namespace sun { namespace star { namespace awt { struct WindowEvent; } } } }
namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } }
class SdDrawDocument;
namespace sd
{
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
index 8bac5da..7d89fdc 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSBITMAPFACTORY_HXX
#include <PreviewRenderer.hxx>
#include <memory>
class SdPage;
class Size;
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 53fb945..583601b 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -25,6 +25,7 @@
#include <comphelper/propertysequence.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 5d2a22c..ea7aa97 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -22,9 +22,10 @@
#include <com/sun/star/uno/Any.hxx>
#include <vcl/timer.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <memory>
namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
namespace sd { namespace slidesorter { namespace cache {
/** A very simple and easy-to-use access to configuration entries regarding
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index 9eb380a..c5a83ec 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -22,10 +22,12 @@
#include "SlsQueueProcessor.hxx"
#include "SlsRequestPriorityClass.hxx"
#include "SlsRequestFactory.hxx"
#include "SlsBitmapCache.hxx"
#include <cache/SlsPageCacheManager.hxx>
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageDescriptor.hxx>
#include <controller/SlideSorterController.hxx>
#include <tools/debug.hxx>
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index 39f9be0..d58010b1 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -20,10 +20,11 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSGENERICPAGECACHE_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSGENERICPAGECACHE_HXX
#include <SlideSorter.hxx>
#include "SlsRequestQueue.hxx"
#include <memory>
#include <vcl/bitmapex.hxx>
namespace sd { namespace slidesorter { namespace cache {
class BitmapCache;
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 3c480192..f009abc 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -20,7 +20,9 @@
#include "SlsQueueProcessor.hxx"
#include "SlsCacheConfiguration.hxx"
#include "SlsRequestQueue.hxx"
#include "SlsBitmapCache.hxx"
#include <sdpage.hxx>
#include <comphelper/profilezone.hxx>
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index a6ea8a4..48bf21f 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -20,25 +20,12 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSQUEUEPROCESSOR_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSQUEUEPROCESSOR_HXX
#include <cache/SlsPageCache.hxx>
#include <cache/SlsCacheContext.hxx>
#include "SlsRequestPriorityClass.hxx"
#include "SlsBitmapFactory.hxx"
#include <view/SlideSorterView.hxx>
#include <tools/IdleDetection.hxx>
#include "SlsBitmapCache.hxx"
#include <sdpage.hxx>
#include <Window.hxx>
#include <svx/svdpagv.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <functional>
namespace sd { namespace slidesorter { namespace view {
class SlideSorterView;
} } }
namespace sd { namespace slidesorter { namespace cache {
class BitmapCache;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 2470ffe..b6c3058 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -22,7 +22,6 @@
#include "SlsRequestPriorityClass.hxx"
#include <cache/SlsCacheContext.hxx>
#include <drawdoc.hxx>
#include <osl/mutex.hxx>
#include <svx/sdrpageuser.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 3a2ed06..f0c581b 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -20,11 +20,9 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_CONTROLLER_SLSDRAGANDDROPCONTEXT_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CONTROLLER_SLSDRAGANDDROPCONTEXT_HXX
#include <tools/gen.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <controller/SlsInsertionIndicatorHandler.hxx>
#include <vector>
class Point;
namespace sd { namespace slidesorter {
class SlideSorter;
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 8cf4f88..1268a6a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -25,8 +25,6 @@
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <cppuhelper/compbase.hxx>
@@ -57,8 +55,6 @@ typedef cppu::WeakComponentImplHelper<
css::frame::XFrameActionListener
> ListenerInterfaceBase;
class SlideSorterController;
/** Listen for events of various types and sources and react to them. This
class is a part of the controller.
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index d416a3e..6fb776e 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -18,6 +18,7 @@
*/
#include "SlideSorterService.hxx"
#include <SlideSorter.hxx>
#include <facreg.hxx>
#include <controller/SlideSorterController.hxx>
#include <controller/SlsProperties.hxx>
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index f793b7a..f1a2181 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -20,19 +20,15 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_SHELL_SLIDESORTERSERVICE_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_SHELL_SLIDESORTERSERVICE_HXX
#include <SlideSorter.hxx>
#include <tools/PropertySet.hxx>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/drawing/SlideSorter.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/drawing/XSlideSorterBase.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
namespace sd { namespace slidesorter {
typedef ::cppu::WeakComponentImplHelper <
@@ -41,6 +37,8 @@ typedef ::cppu::WeakComponentImplHelper <
css::awt::XWindowListener
> SlideSorterServiceInterfaceBase;
class SlideSorter;
/** Implementation of the com.sun.star.drawing.SlideSorter service.
*/
class SlideSorterService
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 107be2d..df545f2 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -21,15 +21,17 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_VIEW_SLSLAYEREDDEVICE_HXX
#include <view/SlsILayerPainter.hxx>
#include <SlideSorter.hxx>
#include <vcl/region.hxx>
#include <vcl/virdev.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/mapmod.hxx>
#include <memory>
#include <vector>
namespace sd { class Window; }
namespace tools { class Rectangle; }
namespace vcl { class Region; }
class VirtualDevice;
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 9d8f34d..5faa59f 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -20,17 +20,13 @@
#ifndef INCLUDED_SD_SOURCE_UI_TABLE_TABLEDESIGNPANE_HXX
#define INCLUDED_SD_SOURCE_UI_TABLE_TABLEDESIGNPANE_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/LayoutSize.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <svtools/valueset.hxx>
#include <vcl/button.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
namespace sd
{
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 2222171..7ed95bb 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_TABLE_TABLEOBJECTBAR_HXX
#define INCLUDED_SD_SOURCE_UI_TABLE_TABLEOBJECTBAR_HXX
#include <sfx2/module.hxx>
#include <sfx2/shell.hxx>
#include <glob.hxx>
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx
index fa405a3..58eeaa4 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx
@@ -20,7 +20,9 @@
#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNODOCUMENTSETTINGS_HXX
#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNODOCUMENTSETTINGS_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
class SdXImpressDocument;
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 2077b29..612dfd2 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -22,13 +22,9 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <sfx2/sfxuno.hxx>
namespace com
@@ -37,10 +33,6 @@ namespace com
{
namespace star
{
namespace lang
{
class XMultiServiceFactory;
}
namespace beans
{
struct PropertyValue;
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index 2545f7e..bf1b7b7 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -36,7 +36,6 @@
#include <drawdoc.hxx>
class SdXImpressDocument;
class SdCustomShow;
class SdXCustomPresentation : public ::cppu::WeakImplHelper< css::container::XIndexContainer,
@@ -97,8 +96,6 @@ public:
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
};
class List;
class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper< css::container::XNameContainer,
css::lang::XSingleServiceFactory,
css::lang::XServiceInfo >
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index a8ea244..25dea5c 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNOLAYER_HXX
#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOLAYER_HXX
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/drawing/XLayer.hpp>
#include <com/sun/star/drawing/XLayerManager.hpp>
@@ -31,7 +30,6 @@
class SdrLayer;
class SdLayerManager;
class SdXImpressDocument;
class SvUnoWeakContainer;
namespace sd {
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 4f6716e..9f34739 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -23,8 +23,6 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/uno/Reference.h>
#include <cppuhelper/implbase.hxx>
@@ -36,10 +34,6 @@ namespace com
{
namespace star
{
namespace lang
{
class XMultiServiceFactory;
}
namespace beans
{
struct PropertyValue;
@@ -48,6 +42,8 @@ namespace com
}
}
namespace com { namespace sun { namespace star { namespace frame { struct DispatchDescriptor; } } } }
class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
{
public:
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 0fa9873..b258f4f 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -19,20 +19,17 @@
#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNOOBJ_HXX
#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOOBJ_HXX
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <svx/svdpool.hxx>
#include <svx/unomaster.hxx>
#include <editeng/unoipset.hxx>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
class SdrObject;
class SdXImpressDocument;
class SdAnimationInfo;
class SvxItemPropertySet;
class SvxShape;
struct SfxItemPropertyMapEntry;
class SdXShape : public SvxShapeMaster,
public css::document::XEventsSupplier
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 3770f6c..ff026e9 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -28,6 +28,7 @@
#include <svx/svdobj.hxx>
#include <svx/unoprov.hxx>
#include <svx/unoshape.hxx>
#include <svx/unoshprp.hxx>
#include "unopback.hxx"
#include <drawdoc.hxx>
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index bbf5dc9..fc549c2 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -28,16 +28,18 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <svx/unoshprp.hxx>
#include <editeng/unoipset.hxx>
#include <svl/lstner.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();
class SdDrawDocument;
class SdrModel;
class SfxItemSet;
class SvxItemPropertySet;
struct SfxItemPropertySimpleEntry;
const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();
class SdUnoPageBackground final : public ::cppu::WeakImplHelper<
css::beans::XPropertySet,
