From 2b39827a0ef0ee3065e3e6abed371cd68c38e83d Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Wed, 31 Oct 2018 01:07:00 +0100 Subject: 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 --- sd/IwyuFilter_sd.yaml | 3 +++ .../controller/SlsInsertionIndicatorHandler.cxx | 1 + .../ui/slidesorter/controller/SlsListener.cxx | 2 ++ .../ui/slidesorter/controller/SlsListener.hxx | 2 ++ .../slidesorter/controller/SlsScrollBarManager.cxx | 1 + .../controller/SlsVisibleAreaManager.cxx | 2 ++ .../ui/slidesorter/inc/cache/SlsCacheContext.hxx | 5 +++-- .../ui/slidesorter/inc/cache/SlsPageCache.hxx | 1 - .../inc/controller/SlideSorterController.hxx | 22 +++++++++++++++++----- .../inc/controller/SlsAnimationFunction.hxx | 4 ---- .../ui/slidesorter/inc/controller/SlsAnimator.hxx | 6 +++--- .../ui/slidesorter/inc/controller/SlsClipboard.hxx | 9 +-------- .../inc/controller/SlsCurrentSlideManager.hxx | 1 - .../controller/SlsInsertionIndicatorHandler.hxx | 7 +++---- .../slidesorter/inc/controller/SlsPageSelector.hxx | 1 - .../inc/controller/SlsScrollBarManager.hxx | 7 +++---- .../inc/controller/SlsSelectionFunction.hxx | 5 ++--- .../inc/controller/SlsSelectionManager.hxx | 5 +---- .../inc/controller/SlsSelectionObserver.hxx | 2 +- .../slidesorter/inc/controller/SlsSlotManager.hxx | 4 +--- .../inc/controller/SlsTransferableData.hxx | 1 - .../inc/controller/SlsVisibleAreaManager.hxx | 5 ++++- .../ui/slidesorter/inc/model/SlideSorterModel.hxx | 7 ++++--- .../ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 6 +++--- .../slidesorter/inc/model/SlsPageEnumeration.hxx | 4 ---- .../ui/slidesorter/inc/model/SlsVisualState.hxx | 2 -- .../ui/slidesorter/inc/view/SlideSorterView.hxx | 18 ++++-------------- .../ui/slidesorter/inc/view/SlsFontProvider.hxx | 1 - .../ui/slidesorter/inc/view/SlsILayerPainter.hxx | 1 - .../inc/view/SlsInsertionIndicatorOverlay.hxx | 7 +------ sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 14 ++++++-------- .../slidesorter/inc/view/SlsPageObjectLayouter.hxx | 2 +- .../slidesorter/inc/view/SlsPageObjectPainter.hxx | 6 +++--- sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 6 ++---- sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx | 3 ++- .../ui/slidesorter/model/SlsPageEnumeration.cxx | 1 + .../ui/slidesorter/view/SlsInsertAnimator.cxx | 1 + sd/source/ui/slidesorter/view/SlsLayouter.cxx | 2 ++ .../ui/slidesorter/view/SlsPageObjectPainter.cxx | 1 + sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2 ++ 40 files changed, 83 insertions(+), 97 deletions(-) diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 0e1203fbe981..b0d04bbbf022 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -186,3 +186,6 @@ blacklist: 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 4bbbbd468944..6a691e4219f9 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 7e9e05c097a5..d65299ae7b84 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 887ebcea7c58..8cf4f8824641 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -34,6 +34,8 @@ #include #include +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 1330ad1953f0..f7d8f928a4aa 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index dd024dda7a65..49c8ea58953e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -28,6 +28,8 @@ #include #include #include +#include +#include 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 a662f1983e85..bb4c2b9e91fb 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 -#include +#include #include #include +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 096322324333..5a3f65f53866 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 -#include #include #include diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index dbc937e4a537..bd23def8abd5 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 -#include +#include -#include - -#include -#include #include #include +#include +#include #include #include +#include + +namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } } +namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace sd { class FuPoor; } +namespace sd { class Window; } +namespace vcl { class Window; } namespace sd { namespace slidesorter { class SlideSorter; @@ -46,6 +51,13 @@ namespace sd { namespace slidesorter { namespace model { 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 485dd47d3119..9af186531936 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 #include #include #include -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 bfa41444f090..af705bd05385 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 #include #include -#include -#include #include #include @@ -32,6 +29,9 @@ #include #include +namespace sd { namespace slidesorter { class SlideSorter; } } +namespace o3tl { template 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 3666eec12373..dbb233d8ccbb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -27,13 +27,10 @@ #include #include -#include -#include +#include #include -#include - class SfxRequest; struct AcceptDropEvent; class DropTargetHelper; @@ -51,10 +48,6 @@ namespace sd { namespace slidesorter { 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 03816cd1a5a0..58d25f017984 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -23,7 +23,6 @@ #include #include #include -#include class SdPage; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index 62900ae3189f..b16e3d3e67fd 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 +#include #include -#include namespace sd { namespace slidesorter { class SlideSorter; } } namespace sd { namespace slidesorter { namespace view { @@ -31,9 +30,9 @@ class InsertAnimator; 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 2a5e57e74e29..cc994ced28af 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -22,7 +22,6 @@ #include -#include #include #include diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index e9677e464dda..9073e2cfe329 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 - #include #include #include +#include +#include #include -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 362b9403b7d5..9516e3d60bdb 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 #include -#include #include -#include #include 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 7bc7c72bb0a5..de65f7fce44d 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 -#include #include -#include #include -#include #include +#include class SdPage; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx index f65a06bf43e2..c05815e7240c 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx @@ -28,8 +28,8 @@ namespace sd { namespace slidesorter { 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 28b2bfeb18f7..c2e58ce62e12 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include class AbstractSvxNameDialog; class SfxItemSet; @@ -33,8 +33,6 @@ class SlideSorter; 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 9d942c59c395..676d99eee571 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -23,7 +23,6 @@ #include #include -#include 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 cad97d796f22..acd74e2b5ffc 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 #include #include +#include +#include + +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 e5d859f743be..ce223caa7c32 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 #include #include -#include #include #include +#include #include -#include class SdrPage; class SdPage; @@ -40,6 +38,9 @@ namespace sd { namespace slidesorter { 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 a118f9c2683a..247588b6b2e2 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 -#include #include -#include -#include +#include #include +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 12a36cac7b8c..5816fd41bcd9 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 - -#include - #include #include diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index cfc08548482b..392c2e4c6667 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 5706500825c9..3ca03fba5d9b 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 #include #include #include #include #include -#include -#include -#include #include -#include #include -#include -#include #include -class Point; - -namespace sd { namespace slidesorter { namespace controller { -class Properties; -} } } - namespace sd { namespace slidesorter { namespace cache { class PageCache; } } } @@ -51,10 +38,13 @@ namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; } } } +namespace o3tl { template 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 0175f6e07200..3705546a8a56 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -23,7 +23,6 @@ #include #include -#include 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 35c58de2b285..a8c39b9bc650 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 #include class OutputDevice; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 9dcbd754e04c..8b3a408ca45f 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 #include #include -#include #include #include @@ -31,15 +29,12 @@ #include 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 dce7ebc9edbf..a57b3a7ece38 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 -#include -#include +#include +#include #include -#include -#include #include -#include -#include -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 4dcfd6aadc18..9b8629fa642f 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 #include #include #include 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 ce7098a86a0d..4cd1deaeec5c 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 -#include -#include +#include #include #include @@ -30,6 +28,8 @@ namespace sd { namespace slidesorter { namespace cache { 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 1f4827c0c5a6..e94c97b1c44b 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 - #include -#include -#include #include #include +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 3f3b2ea24291..a73c966aef38 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 #include #include +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 4b4c7f13409d..a822010d6ac0 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -22,6 +22,7 @@ #include +#include #include #include diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 4a1dafead1dd..3bb9477fbe1d 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index d2bb1c9ca73d..ca0560874257 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 +#include #include #include #include diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index bd8c071b8895..9332934258ed 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include "SlsFramePainter.hxx" #include #include diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index d33f32a368c9..4245b03b4c25 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 #include #include #include #include +#include #include #include #include -- cgit