tdf#42949 Fix IWYU warnings in sd/source/ui/slidesorter/inc/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I48e3c5a62314baa11d6c53ce41311a9a0f1c661b
Reviewed-on: https://gerrit.libreoffice.org/62678
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 0e1203f..b0d04bb 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -186,3 +186,6 @@
sd/source/ui/inc/tools/SlotStateListener.hxx:
# base class has to be a complete type
- com/sun/star/frame/XStatusListener.hpp
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:
# Needed for template
- o3tl/deleter.hxx
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 4bbbbd4..6a691e4 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -21,6 +21,7 @@
#include <controller/SlsProperties.hxx>
#include <view/SlideSorterView.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsInsertAnimator.hxx>
#include <view/SlsInsertionIndicatorOverlay.hxx>
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageEnumerationProvider.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 7e9e05c0..d65299a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -21,6 +21,7 @@
#include <SlideSorter.hxx>
#include <SlideSorterViewShell.hxx>
#include <ViewShell.hxx>
#include <ViewShellHint.hxx>
#include <controller/SlideSorterController.hxx>
#include <controller/SlsPageSelector.hxx>
@@ -35,6 +36,7 @@
#include <drawdoc.hxx>
#include <sdpage.hxx>
#include <DrawDocShell.hxx>
#include <svx/svdpage.hxx>
#include <ViewShellBase.hxx>
#include <ViewShellManager.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 887ebce..8cf4f88 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -34,6 +34,8 @@
#include <tools/link.hxx>
#include <memory>
class SdrPage;
namespace sd {
class ViewShellBase;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 1330ad1..f7d8f92 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -20,6 +20,7 @@
#include <controller/SlsScrollBarManager.hxx>
#include <SlideSorter.hxx>
#include <ViewShell.hxx>
#include <controller/SlideSorterController.hxx>
#include <controller/SlsVisibleAreaManager.hxx>
#include <model/SlideSorterModel.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index dd024dd..49c8ea5 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -28,6 +28,8 @@
#include <controller/SlsScrollBarManager.hxx>
#include <controller/SlsCurrentSlideManager.hxx>
#include <Window.hxx>
#include <SlideSorter.hxx>
#include <view/SlideSorterView.hxx>
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
index a662f19..bb4c2b9 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
@@ -21,12 +21,13 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CACHE_SLSCACHECONTEXT_HXX
#include <sal/types.h>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
#include <vector>
namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
class SdrPage;
class BitmapEx;
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 0963223..5a3f65f 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CACHE_SLSPAGECACHE_HXX
#include <cache/SlsCacheContext.hxx>
#include <sal/types.h>
#include <vcl/bitmapex.hxx>
#include <memory>
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index dbc937e..bd23def 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -21,18 +21,23 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLIDESORTERCONTROLLER_HXX
#include <model/SlsSharedPageDescriptor.hxx>
#include <ViewShell.hxx>
#include <pres.hxx>
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <sfx2/shell.hxx>
#include <sfx2/viewfac.hxx>
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <sddllapi.h>
#include <memory>
#include <vector>
namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
namespace sd { class FuPoor; }
namespace sd { class Window; }
namespace vcl { class Window; }
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -46,6 +51,13 @@
class SlideSorterModel;
} } }
class CommandEvent;
class SdPage;
class SfxItemSet;
class SfxRequest;
class VclSimpleEvent;
class VclWindowEvent;
namespace sd { namespace slidesorter { namespace controller {
class Animator;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index 485dd47..9af1865 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -20,15 +20,11 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSANIMATIONFUNCTION_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSANIMATIONFUNCTION_HXX
#include <model/SlsSharedPageDescriptor.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <functional>
#include <vector>
namespace sd { namespace slidesorter { namespace view {
class SlideSorterView;
} } }
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index bfa4144..af705bd 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -20,11 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSANIMATOR_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSANIMATOR_HXX
#include <SlideSorter.hxx>
#include <view/SlideSorterView.hxx>
#include <canvas/elapsedtime.hxx>
#include <o3tl/deleter.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <sal/types.h>
@@ -32,6 +29,9 @@
#include <memory>
#include <vector>
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace o3tl { template <typename T> struct default_delete; }
namespace sd { namespace slidesorter { namespace controller {
/** Experimental class for simple eye candy animations.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 3666eec..dbb233d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -27,13 +27,10 @@
#include <sal/types.h>
#include <o3tl/deleter.hxx>
#include <tools/solar.h>
#include <svx/svdpage.hxx>
#include <svx/svdtypes.hxx>
#include <sddllapi.h>
#include <set>
class SfxRequest;
struct AcceptDropEvent;
class DropTargetHelper;
@@ -51,10 +48,6 @@
class SlideSorter;
} }
namespace sd { namespace slidesorter { namespace model {
class PageDescriptor;
} } }
namespace sd { namespace slidesorter { namespace controller {
class SlideSorterController;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index 03816cd..58d25f01 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -23,7 +23,6 @@
#include <model/SlsSharedPageDescriptor.hxx>
#include <vcl/timer.hxx>
#include <tools/link.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
class SdPage;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
index 62900ae..b16e3d3 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
@@ -20,10 +20,9 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSINSERTIONINDICATORHANDLER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSINSERTIONINDICATORHANDLER_HXX
#include <view/SlsInsertAnimator.hxx>
#include <controller/SlsAnimator.hxx>
#include <view/SlsLayouter.hxx>
#include <sdxfer.hxx>
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace view {
@@ -31,9 +30,9 @@
class InsertionIndicatorOverlay;
} } }
namespace sd { namespace slidesorter { namespace controller {
class SdTransferable;
class Transferable;
namespace sd { namespace slidesorter { namespace controller {
/** Manage the visibility and location of the insertion indicator. Its
actual display is controlled by the InsertionIndicatorOverlay.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 2a5e57e..cc994ce 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -22,7 +22,6 @@
#include <model/SlsSharedPageDescriptor.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <vector>
#include <memory>
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index e9677e4..9073e2c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -20,16 +20,15 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSCROLLBARMANAGER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSCROLLBARMANAGER_HXX
#include <SlideSorter.hxx>
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <vcl/timer.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/vclptr.hxx>
#include <functional>
class ScrollBar;
class ScrollBarBox;
namespace sd { class Window; }
namespace sd { namespace slidesorter { class SlideSorter; } }
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 362b940..9516e3d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -20,17 +20,16 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSELECTIONFUNCTION_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSELECTIONFUNCTION_HXX
#include <model/SlsSharedPageDescriptor.hxx>
#include <controller/SlsFocusManager.hxx>
#include <controller/SlsInsertionIndicatorHandler.hxx>
#include <fupoor.hxx>
#include <vcl/transfer.hxx>
#include <memory>
namespace sd { namespace slidesorter {
class SlideSorter;
} }
struct AcceptDropEvent;
namespace sd { namespace slidesorter { namespace controller {
class SlideSorterController;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 7bc7c72..de65f7f 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -20,13 +20,10 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSELECTIONMANAGER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSELECTIONMANAGER_HXX
#include <model/SlsSharedPageDescriptor.hxx>
#include <controller/SlsAnimator.hxx>
#include <sal/types.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <basegfx/range/b2irectangle.hxx>
#include <vector>
#include <memory>
class SdPage;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index f65a06b..c05815e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -28,8 +28,8 @@
class SlideSorter;
} }
class SdDrawDocument;
class SdrPage;
class SdPage;
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index 28b2bfe..c2e58ce 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -21,7 +21,7 @@
#include <model/SlsSharedPageDescriptor.hxx>
#include <tools/link.hxx>
#include <queue>
#include <rtl/ustring.hxx>
class AbstractSvxNameDialog;
class SfxItemSet;
@@ -33,8 +33,6 @@
namespace sd { namespace slidesorter { namespace controller {
class Command;
/** This manager takes over the work of handling slot calls from the
controller of the slide sorter.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 9d942c5..676d99e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -23,7 +23,6 @@
#include <sdxfer.hxx>
#include <vector>
#include <functional>
class SdDrawDocument;
namespace sd { namespace slidesorter {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
index cad97d7..acd74e2 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
@@ -20,9 +20,12 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSVISIBLEAREAMANAGER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSVISIBLEAREAMANAGER_HXX
#include <controller/SlsAnimator.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <boost/optional.hpp>
#include <tools/gen.hxx>
#include <vector>
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index e5d859f..ce223ca 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -22,16 +22,14 @@
class SdDrawDocument;
#include <model/SlsPageEnumeration.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <pres.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <osl/mutex.hxx>
#include <vcl/region.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <vector>
#include <functional>
class SdrPage;
class SdPage;
@@ -40,6 +38,9 @@
class SlideSorter;
} }
namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
namespace sd { namespace slidesorter { namespace model {
inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; }
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index a118f9c..247588b 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_MODEL_SLSPAGEDESCRIPTOR_HXX
#include <model/SlsVisualState.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <tools/gen.hxx>
#include <vcl/bitmap.hxx>
#include <sfx2/viewfrm.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
class SdPage;
class SdrPage;
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 12a36ca..5816fd4 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
@@ -20,10 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_MODEL_SLSPAGEENUMERATION_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_MODEL_SLSPAGEENUMERATION_HXX
#include <sal/types.h>
#include <pres.hxx>
#include <model/SlsEnumeration.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index cfc0854..392c2e4 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -25,8 +25,6 @@
namespace sd { namespace slidesorter { namespace model {
class PageDescriptor;
/** This class gives access to values related to the visualization of page
objects. This includes animation state when blending from one state to
another.
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 5706500..3ca03fb 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -20,29 +20,16 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLIDESORTERVIEW_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLIDESORTERVIEW_HXX
#include <SlideSorter.hxx>
#include <model/SlsPageDescriptor.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsILayerPainter.hxx>
#include <View.hxx>
#include <sfx2/viewfrm.hxx>
#include <pres.hxx>
#include <o3tl/deleter.hxx>
#include <tools/gen.hxx>
#include <svx/svdmodel.hxx>
#include <vcl/region.hxx>
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <memory>
class Point;
namespace sd { namespace slidesorter { namespace controller {
class Properties;
} } }
namespace sd { namespace slidesorter { namespace cache {
class PageCache;
} } }
@@ -51,10 +38,13 @@
class SlideSorterModel;
} } }
namespace o3tl { template <typename T> struct default_delete; }
namespace sd { class Window; }
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace view {
class LayeredDevice;
class Layouter;
class PageObjectPainter;
class ToolTip;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index 0175f6e..3705546 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -23,7 +23,6 @@
#include <tools/SdGlobalResourceContainer.hxx>
#include <memory>
#include <vcl/mapmod.hxx>
namespace vcl { class Font; }
diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
index 35c58de..a8c39b9 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX
#include <sal/types.h>
#include <memory>
class OutputDevice;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 9dcbd75..8b3a408 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSINSERTIONINDICATOROVERLAY_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSINSERTIONINDICATOROVERLAY_HXX
#include <model/SlsSharedPageDescriptor.hxx>
#include <view/SlsILayerPainter.hxx>
#include <controller/SlsTransferableData.hxx>
#include <sdxfer.hxx>
#include <tools/gen.hxx>
#include <vcl/bitmapex.hxx>
@@ -31,15 +29,12 @@
#include <vector>
class OutputDevice;
class SdTransferable;
namespace sd { namespace slidesorter {
class SlideSorter;
} }
namespace sd { namespace slidesorter { namespace controller {
class Transferable;
} } }
namespace sd { namespace slidesorter { namespace view {
class FramePainter;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index dce7ebc..a57b3a7 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -20,17 +20,15 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSLAYOUTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSLAYOUTER_HXX
#include <SlideSorter.hxx>
#include <view/SlsPageObjectLayouter.hxx>
#include <view/SlsTheme.hxx>
#include <vcl/vclptr.hxx>
#include <tools/gen.hxx>
#include <sal/types.h>
#include <tools/fract.hxx>
#include <vcl/mapmod.hxx>
#include <memory>
#include <vector>
#include <utility>
class Size;
namespace sd { class Window; }
namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; } } }
namespace sd { namespace slidesorter { namespace view { class PageObjectLayouter; } } }
namespace sd { namespace slidesorter { namespace view { class Theme; } } }
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 4dcfd6a..9b8629f 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTLAYOUTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTLAYOUTER_HXX
#include <SlideSorter.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <tools/gen.hxx>
#include <vcl/image.hxx>
namespace vcl { class Font; }
namespace sd { class Window; }
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index ce7098a8..4cd1dea 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTPAINTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTPAINTER_HXX
#include <SlideSorter.hxx>
#include <model/SlsPageDescriptor.hxx>
#include <view/SlsLayouter.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <view/SlsTheme.hxx>
#include <memory>
@@ -30,6 +28,8 @@
class PageCache;
} } }
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace view {
class Layouter;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 1f4827c..e94c97b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -20,15 +20,13 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTHEME_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTHEME_HXX
#include <model/SlsVisualState.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/font.hxx>
#include <vcl/gradient.hxx>
#include <tools/color.hxx>
#include <memory>
namespace vcl { class Font; }
namespace sd { namespace slidesorter { namespace controller {
class Properties;
} } }
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index 3f3b2ea..a73c966 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -20,10 +20,11 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTOOLTIP_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTOOLTIP_HXX
#include <SlideSorter.hxx>
#include <model/SlsSharedPageDescriptor.hxx>
#include <vcl/timer.hxx>
namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace view {
/** Manage the display of tool tips. The tool tip text changes when the
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 4b4c7f1..a822010 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -22,6 +22,7 @@
#include <utility>
#include <model/SlsPageEnumeration.hxx>
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageDescriptor.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 4a1dafe..3bb9477 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -24,6 +24,7 @@
#include <view/SlsLayouter.hxx>
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageEnumerationProvider.hxx>
#include <SlideSorter.hxx>
#include <Window.hxx>
#include <memory>
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index d2bb1c9..ca05608 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <view/SlsPageObjectLayouter.hxx>
#include <view/SlsTheme.hxx>
#include <view/SlsLayouter.hxx>
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageDescriptor.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index bd8c071..9332934 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -24,6 +24,7 @@
#include <view/SlsPageObjectLayouter.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsTheme.hxx>
#include <SlideSorter.hxx>
#include "SlsFramePainter.hxx"
#include <cache/SlsPageCache.hxx>
#include <controller/SlsProperties.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index d33f32a..4245b03 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -17,10 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <view/SlsPageObjectLayouter.hxx>
#include <view/SlsToolTip.hxx>
#include <view/SlideSorterView.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsTheme.hxx>
#include <SlideSorter.hxx>
#include <Window.hxx>
#include <sdpage.hxx>
#include <sdresid.hxx>
