From 5f0ddf22df22f6c4d35a42c205eb064e8fb8e6ce Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:32:17 +0200 Subject: loplugin:includeform: slideshow Change-Id: Idbfda5c87dafd6f5f76f724030f0a153398d7ab3 --- .../source/engine/activities/activitiesfactory.cxx | 6 ++-- .../source/engine/activities/activitybase.cxx | 2 +- .../source/engine/activities/activitybase.hxx | 6 ++-- .../engine/activities/activityparameters.hxx | 8 ++--- .../engine/activities/continuousactivitybase.cxx | 2 +- .../activities/continuouskeytimeactivitybase.cxx | 2 +- .../engine/activities/discreteactivitybase.cxx | 2 +- .../engine/activities/discreteactivitybase.hxx | 2 +- .../activities/simplecontinuousactivitybase.cxx | 2 +- slideshow/source/engine/activitiesqueue.cxx | 6 ++-- .../engine/animationnodes/animationaudionode.cxx | 6 ++-- .../engine/animationnodes/animationaudionode.hxx | 8 ++--- .../engine/animationnodes/animationbasenode.cxx | 6 ++-- .../engine/animationnodes/animationbasenode.hxx | 12 +++---- .../engine/animationnodes/animationcolornode.cxx | 8 ++--- .../engine/animationnodes/animationcolornode.hxx | 2 +- .../engine/animationnodes/animationcommandnode.cxx | 4 +-- .../engine/animationnodes/animationcommandnode.hxx | 8 ++--- .../engine/animationnodes/animationnodefactory.cxx | 4 +-- .../animationnodes/animationpathmotionnode.cxx | 2 +- .../animationnodes/animationpathmotionnode.hxx | 2 +- .../engine/animationnodes/animationsetnode.cxx | 6 ++-- .../animationnodes/animationtransformnode.cxx | 4 +-- .../animationnodes/animationtransformnode.hxx | 2 +- .../animationtransitionfilternode.cxx | 2 +- .../animationtransitionfilternode.hxx | 2 +- .../engine/animationnodes/basecontainernode.cxx | 8 ++--- .../source/engine/animationnodes/basenode.cxx | 12 +++---- .../source/engine/animationnodes/generateevent.cxx | 10 +++--- .../source/engine/animationnodes/generateevent.hxx | 6 ++-- .../source/engine/animationnodes/nodetools.cxx | 2 +- .../source/engine/animationnodes/nodetools.hxx | 8 ++--- .../animationnodes/paralleltimecontainer.cxx | 2 +- .../animationnodes/paralleltimecontainer.hxx | 2 +- .../animationnodes/propertyanimationnode.cxx | 2 +- .../animationnodes/sequentialtimecontainer.cxx | 8 ++--- .../animationnodes/sequentialtimecontainer.hxx | 2 +- .../source/engine/animationnodes/setactivity.hxx | 10 +++--- slideshow/source/engine/attributemap.cxx | 4 +-- slideshow/source/engine/delayevent.cxx | 2 +- slideshow/source/engine/effectrewinder.cxx | 10 +++--- slideshow/source/engine/effectrewinder.hxx | 10 +++--- slideshow/source/engine/eventmultiplexer.cxx | 14 ++++---- slideshow/source/engine/pointersymbol.cxx | 2 +- slideshow/source/engine/pointersymbol.hxx | 10 +++--- .../source/engine/rehearsetimingsactivity.cxx | 12 +++---- .../source/engine/rehearsetimingsactivity.hxx | 2 +- slideshow/source/engine/screenupdater.cxx | 4 +-- slideshow/source/engine/shapes/appletshape.cxx | 4 +-- slideshow/source/engine/shapes/backgroundshape.cxx | 6 ++-- .../source/engine/shapes/drawinglayeranimation.cxx | 18 +++++----- slideshow/source/engine/shapes/drawshape.cxx | 10 +++--- slideshow/source/engine/shapes/drawshape.hxx | 6 ++-- .../source/engine/shapes/drawshapesubsetting.hxx | 4 +-- .../source/engine/shapes/externalshapebase.cxx | 8 ++--- .../source/engine/shapes/externalshapebase.hxx | 10 +++--- slideshow/source/engine/shapes/gdimtftools.cxx | 4 +-- slideshow/source/engine/shapes/gdimtftools.hxx | 2 +- .../engine/shapes/intrinsicanimationactivity.cxx | 8 ++--- .../engine/shapes/intrinsicanimationactivity.hxx | 8 ++--- slideshow/source/engine/shapes/mediashape.cxx | 6 ++-- slideshow/source/engine/shapes/shapeimporter.cxx | 8 ++--- slideshow/source/engine/shapes/viewappletshape.cxx | 2 +- slideshow/source/engine/shapes/viewappletshape.hxx | 2 +- .../source/engine/shapes/viewbackgroundshape.cxx | 2 +- .../source/engine/shapes/viewbackgroundshape.hxx | 2 +- slideshow/source/engine/shapes/viewmediashape.cxx | 4 +-- slideshow/source/engine/shapes/viewmediashape.hxx | 2 +- slideshow/source/engine/shapes/viewshape.cxx | 2 +- slideshow/source/engine/shapes/viewshape.hxx | 10 +++--- slideshow/source/engine/shapesubset.cxx | 2 +- slideshow/source/engine/slide/layer.hxx | 4 +-- slideshow/source/engine/slide/layermanager.hxx | 8 ++--- slideshow/source/engine/slide/shapemanagerimpl.hxx | 20 ++++++------ slideshow/source/engine/slide/slideanimations.cxx | 2 +- slideshow/source/engine/slide/slideanimations.hxx | 8 ++--- slideshow/source/engine/slide/slideimpl.cxx | 24 +++++++------- .../engine/slide/targetpropertiescreator.cxx | 2 +- slideshow/source/engine/slide/userpaintoverlay.cxx | 16 ++++----- slideshow/source/engine/slide/userpaintoverlay.hxx | 4 +-- slideshow/source/engine/slideshowcontext.cxx | 16 ++++----- slideshow/source/engine/slideshowimpl.cxx | 38 +++++++++++----------- slideshow/source/engine/slideview.cxx | 10 +++--- slideshow/source/engine/soundplayer.cxx | 2 +- slideshow/source/engine/tools.cxx | 6 ++-- .../source/engine/transitions/clippingfunctor.hxx | 2 +- .../source/engine/transitions/fourboxwipe.hxx | 2 +- slideshow/source/engine/transitions/randomwipe.cxx | 2 +- .../engine/transitions/shapetransitionfactory.cxx | 4 +-- .../source/engine/transitions/slidechangebase.cxx | 2 +- .../source/engine/transitions/slidechangebase.hxx | 12 +++---- .../engine/transitions/slidetransitionfactory.cxx | 6 ++-- .../engine/transitions/transitionfactorytab.cxx | 4 +-- slideshow/source/engine/usereventqueue.cxx | 8 ++--- slideshow/source/engine/waitsymbol.cxx | 2 +- slideshow/source/engine/waitsymbol.hxx | 8 ++--- slideshow/source/inc/animation.hxx | 6 ++-- slideshow/source/inc/numberanimation.hxx | 2 +- 98 files changed, 304 insertions(+), 304 deletions(-) diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index f7b3e8f57d0a..dadd590257e0 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -23,12 +23,12 @@ #include #include -#include "activitiesfactory.hxx" -#include "smilfunctionparser.hxx" +#include +#include #include "accumulation.hxx" #include "activityparameters.hxx" #include "interpolation.hxx" -#include "tools.hxx" +#include #include "simplecontinuousactivitybase.hxx" #include "discreteactivitybase.hxx" #include "continuousactivitybase.hxx" diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index e00845bc3501..282604232f69 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include "activitybase.hxx" namespace slideshow diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx index 5db55d22485c..990e65c0ed26 100644 --- a/slideshow/source/engine/activities/activitybase.hxx +++ b/slideshow/source/engine/activities/activitybase.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYBASE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYBASE_HXX -#include "animationactivity.hxx" +#include #include "activityparameters.hxx" -#include "animatableshape.hxx" -#include "shapeattributelayer.hxx" +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/activities/activityparameters.hxx b/slideshow/source/engine/activities/activityparameters.hxx index 1faa1dd26d60..0644ccf85913 100644 --- a/slideshow/source/engine/activities/activityparameters.hxx +++ b/slideshow/source/engine/activities/activityparameters.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYPARAMETERS_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYPARAMETERS_HXX -#include "event.hxx" -#include "eventqueue.hxx" -#include "expressionnode.hxx" -#include "wakeupevent.hxx" +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx index 16b8aed3f714..0928fd1bdd03 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.cxx +++ b/slideshow/source/engine/activities/continuousactivitybase.cxx @@ -18,7 +18,7 @@ */ -#include +#include "continuousactivitybase.hxx" namespace slideshow diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx index 045de8a1852b..c13327a081e5 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx @@ -20,7 +20,7 @@ #include -#include +#include "continuouskeytimeactivitybase.hxx" #include #include diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index e9bacf2a9677..2ce8286767d9 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.cxx @@ -20,7 +20,7 @@ #include -#include +#include "discreteactivitybase.hxx" namespace slideshow diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx index 49d039f71389..205f9e9e4193 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.hxx +++ b/slideshow/source/engine/activities/discreteactivitybase.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_DISCRETEACTIVITYBASE_HXX #include "activitybase.hxx" -#include "wakeupevent.hxx" +#include #include diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 5f4d3950b40a..e52705dec2c8 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -20,7 +20,7 @@ // must be first -#include +#include "simplecontinuousactivitybase.hxx" namespace slideshow diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 7c5acf30d4d7..49996f8809a0 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -22,9 +22,9 @@ #include #include -#include "slideshowexceptions.hxx" -#include "activity.hxx" -#include "activitiesqueue.hxx" +#include +#include +#include #include #include diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index 5ee8860845b0..4aa02f5da7dd 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -21,10 +21,10 @@ #include -#include "eventqueue.hxx" +#include #include "animationaudionode.hxx" -#include "delayevent.hxx" -#include "tools.hxx" +#include +#include #include "nodetools.hxx" using namespace com::sun::star; diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index 75bb75f4b316..6efd40fdbd20 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX -#include "basecontainernode.hxx" -#include "soundplayer.hxx" -#include "com/sun/star/animations/XAnimationNode.hpp" -#include "com/sun/star/animations/XAudio.hpp" +#include +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index d7e3c0ed01c1..36d88d05a2b6 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -26,10 +26,10 @@ #include #include "nodetools.hxx" -#include "doctreenode.hxx" +#include #include "animationbasenode.hxx" -#include "delayevent.hxx" -#include "framerate.hxx" +#include +#include #include #include diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx index 474680c7193f..d2c03a4ec4d3 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.hxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx @@ -21,12 +21,12 @@ #include -#include "basecontainernode.hxx" -#include "activitiesfactory.hxx" -#include "shapeattributelayer.hxx" -#include "shapeattributelayerholder.hxx" -#include "attributableshape.hxx" -#include "shapesubset.hxx" +#include +#include +#include +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index 2ba8e10baa04..79850c84b7a9 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -20,11 +20,11 @@ #include -#include "coloranimation.hxx" -#include "hslcoloranimation.hxx" +#include +#include #include "animationcolornode.hxx" -#include "animationfactory.hxx" -#include "activitiesfactory.hxx" +#include +#include using namespace com::sun::star; diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx index fe0366f9f09e..6ae5f848c849 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.hxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOLORNODE_HXX #include "animationbasenode.hxx" -#include "com/sun/star/animations/XAnimateColor.hpp" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index 1a644d3b982a..0c9519589ed0 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -22,8 +22,8 @@ #include #include "animationcommandnode.hxx" -#include "delayevent.hxx" -#include "tools.hxx" +#include +#include #include "nodetools.hxx" diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index 932524a3abb8..675da7c3b0e8 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX -#include "basecontainernode.hxx" -#include "iexternalmediashapebase.hxx" -#include "soundplayer.hxx" -#include "com/sun/star/animations/XCommand.hpp" +#include +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index cd9594df3e87..1d0edaa2e683 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -27,7 +27,7 @@ #include #include -#include "animationnodefactory.hxx" +#include #include "paralleltimecontainer.hxx" #include "sequentialtimecontainer.hxx" #include "propertyanimationnode.hxx" @@ -39,7 +39,7 @@ #include "animationaudionode.hxx" #include "animationcommandnode.hxx" #include "nodetools.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index 3f830428c6a8..a78583290441 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -19,7 +19,7 @@ #include "animationpathmotionnode.hxx" -#include "animationfactory.hxx" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx index ead89c7e22dc..a6a37a5b7728 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONPATHMOTIONNODE_HXX #include "animationbasenode.hxx" -#include "com/sun/star/animations/XAnimateMotion.hpp" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index 3770790c193e..c2eda0ddc990 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -18,12 +18,12 @@ */ -#include "animationfactory.hxx" +#include #include "setactivity.hxx" #include "animationsetnode.hxx" #include "nodetools.hxx" -#include "tools.hxx" -#include "delayevent.hxx" +#include +#include using namespace com::sun::star; diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index bc9c86462336..394349f5b707 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -21,8 +21,8 @@ #include #include "animationtransformnode.hxx" -#include "animationfactory.hxx" -#include "activitiesfactory.hxx" +#include +#include using namespace com::sun::star; diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx index 604a9b89840a..b664fcb3213b 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONTRANSFORMNODE_HXX #include "animationbasenode.hxx" -#include "com/sun/star/animations/XAnimateTransform.hpp" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx index 6089c8033b9d..6a54d16a6650 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx @@ -19,7 +19,7 @@ #include "animationtransitionfilternode.hxx" -#include "transitionfactory.hxx" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx index 8718426188f4..6790e9d2273a 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONTRANSITIONFILTERNODE_HXX #include "animationbasenode.hxx" -#include "com/sun/star/animations/XTransitionFilter.hpp" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 83f72a96b457..c19165f72cbf 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -18,11 +18,11 @@ */ -#include "basecontainernode.hxx" -#include "eventqueue.hxx" -#include "tools.hxx" +#include +#include +#include #include "nodetools.hxx" -#include "delayevent.hxx" +#include #include #include diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index fd09ad74c1f5..a83daa1889dc 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -25,12 +25,12 @@ #include #include -#include "basenode.hxx" -#include "eventmultiplexer.hxx" -#include "basecontainernode.hxx" -#include "eventqueue.hxx" -#include "delayevent.hxx" -#include "tools.hxx" +#include +#include +#include +#include +#include +#include #include "nodetools.hxx" #include "generateevent.hxx" diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index 513f0bc889b3..962b18e161b3 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -27,11 +27,11 @@ #include #include "generateevent.hxx" -#include "shape.hxx" -#include "subsettableshapemanager.hxx" -#include "usereventqueue.hxx" -#include "slideshowcontext.hxx" -#include "delayevent.hxx" +#include +#include +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/generateevent.hxx b/slideshow/source/engine/animationnodes/generateevent.hxx index 10f66a195903..4879896551fc 100644 --- a/slideshow/source/engine/animationnodes/generateevent.hxx +++ b/slideshow/source/engine/animationnodes/generateevent.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_GENERATEEVENT_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_GENERATEEVENT_HXX -#include "slideshowcontext.hxx" -#include "delayevent.hxx" -#include "com/sun/star/uno/Any.hxx" +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index dd8e30e5be6b..9925513b2254 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include "nodetools.hxx" using namespace ::com::sun::star; diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index da757e7367dd..8b0ecef2d48b 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -23,10 +23,10 @@ #include #include -#include "shapemanager.hxx" -#include "basenode.hxx" -#include "doctreenode.hxx" -#include "attributableshape.hxx" +#include +#include +#include +#include #if defined(DBG_UTIL) diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx index 35e7fb5807bc..a20bab788f84 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx @@ -19,7 +19,7 @@ #include "paralleltimecontainer.hxx" -#include "delayevent.hxx" +#include #include diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx index b5e04c0b6b4e..af3c6e1a9149 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_PARALLELTIMECONTAINER_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_PARALLELTIMECONTAINER_HXX -#include "basecontainernode.hxx" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index e768572ad7aa..c893bb027f36 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -19,7 +19,7 @@ #include "propertyanimationnode.hxx" -#include "animationfactory.hxx" +#include using namespace com::sun::star; diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 68bda1a56999..15e5a7f2763d 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -18,11 +18,11 @@ */ -#include "delayevent.hxx" -#include "eventqueue.hxx" -#include "usereventqueue.hxx" +#include +#include +#include #include "sequentialtimecontainer.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx index 76b7f6c313dc..0ee4e42ef94b 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SEQUENTIALTIMECONTAINER_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SEQUENTIALTIMECONTAINER_HXX -#include "basecontainernode.hxx" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx index 166932f74e05..9b45e72dff59 100644 --- a/slideshow/source/engine/animationnodes/setactivity.hxx +++ b/slideshow/source/engine/animationnodes/setactivity.hxx @@ -21,11 +21,11 @@ #include -#include "animationactivity.hxx" -#include "animation.hxx" -#include "animatableshape.hxx" -#include "shapeattributelayer.hxx" -#include "activitiesfactory.hxx" +#include +#include +#include +#include +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index 02570946d055..3b5da058404e 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -20,8 +20,8 @@ #include -#include "attributemap.hxx" -#include "tools.hxx" +#include +#include namespace slideshow diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx index 78dd0350d4ba..810f99ac328d 100644 --- a/slideshow/source/engine/delayevent.cxx +++ b/slideshow/source/engine/delayevent.cxx @@ -19,7 +19,7 @@ #include -#include "delayevent.hxx" +#include namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index cdf1a02f7685..b14df76a23c8 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -19,11 +19,11 @@ #include "effectrewinder.hxx" -#include "eventqueue.hxx" -#include "usereventqueue.hxx" -#include "mouseeventhandler.hxx" -#include "basecontainernode.hxx" -#include "delayevent.hxx" +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx index c2c5993a36a5..0a88409498ec 100644 --- a/slideshow/source/engine/effectrewinder.hxx +++ b/slideshow/source/engine/effectrewinder.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_EFFECTREWINDER_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_EFFECTREWINDER_HXX -#include "animationnode.hxx" -#include "eventhandler.hxx" -#include "animationeventhandler.hxx" -#include "event.hxx" -#include "screenupdater.hxx" +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index c707af32e91e..88b64ddd8143 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -34,13 +34,13 @@ #include #include -#include "tools.hxx" -#include "eventqueue.hxx" -#include "eventmultiplexer.hxx" -#include "listenercontainer.hxx" -#include "delayevent.hxx" -#include "unoview.hxx" -#include "unoviewcontainer.hxx" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 29728a522189..14c5bdea0b08 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -30,7 +30,7 @@ #include #include "pointersymbol.hxx" -#include "eventmultiplexer.hxx" +#include #include diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx index a9f78500a79d..40e46018443b 100644 --- a/slideshow/source/engine/pointersymbol.hxx +++ b/slideshow/source/engine/pointersymbol.hxx @@ -14,12 +14,12 @@ #include #include -#include "com/sun/star/uno/Reference.hxx" +#include -#include "vieweventhandler.hxx" -#include "screenupdater.hxx" -#include "eventmultiplexer.hxx" -#include "unoview.hxx" +#include +#include +#include +#include #include diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 19a6097d8983..0781a4eea247 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -36,12 +36,12 @@ #include #include -#include "eventqueue.hxx" -#include "screenupdater.hxx" -#include "eventmultiplexer.hxx" -#include "activitiesqueue.hxx" -#include "slideshowcontext.hxx" -#include "mouseeventhandler.hxx" +#include +#include +#include +#include +#include +#include #include "rehearsetimingsactivity.hxx" #include diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx index d6b690fdc0d7..4ae0e16f00ad 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.hxx +++ b/slideshow/source/engine/rehearsetimingsactivity.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_REHEARSETIMINGSACTIVITY_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_REHEARSETIMINGSACTIVITY_HXX -#include "activity.hxx" +#include #include diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 33d78598f3ae..7a950e031cd5 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "screenupdater.hxx" -#include "listenercontainer.hxx" +#include +#include #include diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 30808b598325..ce20c907ae1b 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -22,9 +22,9 @@ #include "appletshape.hxx" #include "externalshapebase.hxx" -#include "vieweventhandler.hxx" +#include #include "viewappletshape.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index b119d8ac77ed..75ff09d55f7a 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -33,10 +33,10 @@ #include #include "backgroundshape.hxx" -#include "slideshowexceptions.hxx" -#include "slideshowcontext.hxx" +#include +#include #include "gdimtftools.hxx" -#include "shape.hxx" +#include #include "viewbackgroundshape.hxx" diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 63006b5af07a..2a642b1a230d 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -38,20 +38,20 @@ #include #include -#include "activity.hxx" -#include "wakeupevent.hxx" -#include "eventqueue.hxx" +#include +#include +#include #include "drawinglayeranimation.hxx" #include "drawshapesubsetting.hxx" #include "drawshape.hxx" -#include "shapesubset.hxx" -#include "shapeattributelayerholder.hxx" -#include "slideshowcontext.hxx" -#include "tools.hxx" +#include +#include +#include +#include #include "gdimtftools.hxx" -#include "eventmultiplexer.hxx" +#include #include "intrinsicanimationactivity.hxx" -#include "intrinsicanimationeventhandler.hxx" +#include #include #include diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index c7ca1f8d4ffe..00a8894f5ef0 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -53,12 +53,12 @@ #include "drawshapesubsetting.hxx" #include "drawshape.hxx" -#include "eventqueue.hxx" -#include "wakeupevent.hxx" -#include "subsettableshapemanager.hxx" +#include +#include +#include #include "intrinsicanimationactivity.hxx" -#include "slideshowexceptions.hxx" -#include "tools.hxx" +#include +#include #include "gdimtftools.hxx" #include "drawinglayeranimation.hxx" diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index 924727577e01..88cc9a264293 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -23,11 +23,11 @@ #include #include -#include "attributableshape.hxx" -#include "doctreenodesupplier.hxx" +#include +#include #include "gdimtftools.hxx" #include "viewshape.hxx" -#include "hyperlinkarea.hxx" +#include #include #include diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index 56c4f5dca346..06d399d4d88e 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX -#include "doctreenode.hxx" -#include "attributableshape.hxx" +#include +#include class GDIMetaFile; diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 13800cefa450..148ed3a6de39 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -25,10 +25,10 @@ #include #include "externalshapebase.hxx" -#include "eventmultiplexer.hxx" -#include "vieweventhandler.hxx" -#include "intrinsicanimationeventhandler.hxx" -#include "tools.hxx" +#include +#include +#include +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index e7dcdf305125..bb393b1f7cc6 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -22,11 +22,11 @@ #include -#include "iexternalmediashapebase.hxx" -#include "unoview.hxx" -#include "subsettableshapemanager.hxx" -#include "slideshowexceptions.hxx" -#include "slideshowcontext.hxx" +#include +#include +#include +#include +#include namespace slideshow diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 1901011a18ac..4e358df4b9d0 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -19,7 +19,7 @@ #include -#include +#include "gdimtftools.hxx" #include #include @@ -44,7 +44,7 @@ #include -#include "tools.hxx" +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index ac3989772e2f..f33dcc93fa15 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -27,7 +27,7 @@ #include -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 04016826e110..895ea94b5812 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -21,11 +21,11 @@ #include #include "drawshapesubsetting.hxx" -#include "subsettableshapemanager.hxx" -#include "eventqueue.hxx" -#include "eventmultiplexer.hxx" +#include +#include +#include #include "intrinsicanimationactivity.hxx" -#include "intrinsicanimationeventhandler.hxx" +#include #include diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx index c19c393a498d..5cc660078895 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_INTRINSICANIMATIONACTIVITY_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_INTRINSICANIMATIONACTIVITY_HXX -#include "wakeupevent.hxx" -#include "activity.hxx" -#include "slideshowcontext.hxx" +#include +#include +#include #include "drawshape.hxx" -#include "tools.hxx" +#include /* Definition of IntrinsicAnimationActivity class */ diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index 62a83117d78d..5cabfe623bff 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -25,9 +25,9 @@ #include "mediashape.hxx" #include "viewmediashape.hxx" #include "externalshapebase.hxx" -#include "slideshowcontext.hxx" -#include "shape.hxx" -#include "tools.hxx" +#include +#include +#include #include diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 918b910a235e..a79b8105f5f7 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -45,11 +45,11 @@ #include "backgroundshape.hxx" #include "mediashape.hxx" #include "appletshape.hxx" -#include "shapeimporter.hxx" -#include "slideshowexceptions.hxx" +#include +#include #include "gdimtftools.hxx" -#include "tools.hxx" -#include "slideshowcontext.hxx" +#include +#include #include diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index f319210e84f1..66bd38b9e665 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -48,7 +48,7 @@ #include #include "viewappletshape.hxx" -#include "tools.hxx" +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index adc66cb6b41d..2a3dafa00588 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -25,7 +25,7 @@ #include -#include "viewlayer.hxx" +#include namespace com { namespace sun { namespace star { namespace frame { diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 10e5d2c4eb6a..9888976973d2 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -22,7 +22,7 @@ #include #include "viewbackgroundshape.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index 92403dad1aae..57598c15dad7 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -30,7 +30,7 @@ #include #include "gdimtftools.hxx" -#include "viewlayer.hxx" +#include namespace slideshow diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 5efe1906bac0..3af464c38d53 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -63,8 +63,8 @@ #include "viewmediashape.hxx" #include "mediashape.hxx" -#include "tools.hxx" -#include "unoview.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 5c0394ff8810..a3881b27936b 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -26,7 +26,7 @@ #include #include -#include "viewlayer.hxx" +#include class SystemChildWindow; namespace vcl { class Window; } diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 05f9fb534e7e..2f360a40706a 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -42,7 +42,7 @@ #include #include "viewshape.hxx" -#include "tools.hxx" +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index 84405dd590a7..74eb3b9af6c2 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -27,11 +27,11 @@ #include #include -#include "tools.hxx" -#include "shapeattributelayer.hxx" -#include "animatedsprite.hxx" -#include "viewlayer.hxx" -#include "doctreenode.hxx" +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 59e97aa31f2f..2dccbc09d516 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -23,7 +23,7 @@ #include #include -#include "shapesubset.hxx" +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 645c249c2011..25dddde4f477 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -23,8 +23,8 @@ #include #include -#include "view.hxx" -#include "animatableshape.hxx" +#include +#include #include #include diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index c40b2ade0498..44e391fe5c7d 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -22,11 +22,11 @@ #include -#include "unoview.hxx" -#include "unoviewcontainer.hxx" -#include "attributableshape.hxx" +#include +#include +#include #include "layer.hxx" -#include "tools.hxx" +#include #include #include diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 3a6ae365f207..6fb693c75818 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -22,17 +22,17 @@ #include #include -#include "shape.hxx" -#include "subsettableshapemanager.hxx" -#include "eventmultiplexer.hxx" +#include +#include +#include #include "layermanager.hxx" -#include "viewupdate.hxx" -#include "shapemaps.hxx" -#include "cursormanager.hxx" -#include "hyperlinkarea.hxx" -#include "listenercontainer.hxx" -#include "shapelistenereventhandler.hxx" -#include "mouseeventhandler.hxx" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 330d204bfcd8..f10f6633a464 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -24,7 +24,7 @@ #include #include "slideanimations.hxx" -#include "animationnodefactory.hxx" +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index 89eca1ca5368..72877197f4f5 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -24,10 +24,10 @@ #include #include -#include "event.hxx" -#include "slideshowcontext.hxx" -#include "subsettableshapemanager.hxx" -#include "animationnode.hxx" +#include +#include +#include +#include namespace com { namespace sun { namespace star { namespace animations { diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 45e58d75c934..c81dfff0d10a 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -42,23 +42,23 @@ #include #include -#include "slide.hxx" -#include "slideshowcontext.hxx" +#include +#include #include "slideanimations.hxx" -#include "doctreenode.hxx" -#include "screenupdater.hxx" -#include "cursormanager.hxx" -#include "shapeimporter.hxx" -#include "slideshowexceptions.hxx" -#include "eventqueue.hxx" -#include "activitiesqueue.hxx" +#include +#include +#include +#include +#include +#include +#include #include "layermanager.hxx" #include "shapemanagerimpl.hxx" -#include "usereventqueue.hxx" +#include #include "userpaintoverlay.hxx" -#include "event.hxx" +#include #include "targetpropertiescreator.hxx" -#include "tools.hxx" +#include #include #include diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index e1af9d2ba385..d7cf667e7cf8 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -30,7 +30,7 @@ #include #include "targetpropertiescreator.hxx" -#include "tools.hxx" +#include namespace slideshow { diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index aae113df63c3..f1a1789ad8c9 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -28,16 +28,16 @@ #include #include -#include "activity.hxx" -#include "slideshowcontext.hxx" +#include +#include #include "userpaintoverlay.hxx" -#include "mouseeventhandler.hxx" -#include "eventmultiplexer.hxx" -#include "screenupdater.hxx" -#include "vieweventhandler.hxx" +#include +#include +#include +#include -#include "slide.hxx" -#include "cursormanager.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx index eb37554defd0..4c2e16288c88 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.hxx +++ b/slideshow/source/engine/slide/userpaintoverlay.hxx @@ -22,8 +22,8 @@ #include -#include "unoview.hxx" -#include "rgbcolor.hxx" +#include +#include #include #include diff --git a/slideshow/source/engine/slideshowcontext.cxx b/slideshow/source/engine/slideshowcontext.cxx index 2bc19cffec2b..856c4d979c01 100644 --- a/slideshow/source/engine/slideshowcontext.cxx +++ b/slideshow/source/engine/slideshowcontext.cxx @@ -20,14 +20,14 @@ #include #include -#include "slideshowcontext.hxx" -#include "subsettableshapemanager.hxx" -#include "screenupdater.hxx" -#include "eventqueue.hxx" -#include "activitiesqueue.hxx" -#include "usereventqueue.hxx" -#include "eventmultiplexer.hxx" -#include "unoviewcontainer.hxx" +#include +#include +#include +#include +#include +#include +#include +#include using namespace ::com::sun::star; diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index fc54b5eecce2..2e20b709faef 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -47,7 +47,7 @@ #include #include -#include "rtl/ref.hxx" +#include #include #include @@ -70,29 +70,29 @@ #include #include -#include "com/sun/star/uno/Reference.hxx" +#include #include -#include "unoviewcontainer.hxx" -#include "transitionfactory.hxx" -#include "eventmultiplexer.hxx" -#include "usereventqueue.hxx" -#include "eventqueue.hxx" -#include "cursormanager.hxx" -#include "slideshowcontext.hxx" -#include "activitiesqueue.hxx" -#include "activitiesfactory.hxx" -#include "interruptabledelayevent.hxx" -#include "slide.hxx" -#include "shapemaps.hxx" -#include "slideview.hxx" -#include "tools.hxx" -#include "unoview.hxx" -#include "slidebitmap.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "rehearsetimingsactivity.hxx" #include "waitsymbol.hxx" #include "effectrewinder.hxx" -#include "framerate.hxx" +#include #include "pointersymbol.hxx" #include diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 6ebe350b9c9c..f81f8bd51482 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -20,11 +20,11 @@ #include #include -#include "eventqueue.hxx" -#include "eventmultiplexer.hxx" -#include "slideview.hxx" -#include "delayevent.hxx" -#include "unoview.hxx" +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 24a809faf68e..9dfffa60fa60 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -31,7 +31,7 @@ #include -#include "soundplayer.hxx" +#include #include diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index db3fbcdfa452..77e4160b4644 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -42,9 +42,9 @@ #include -#include "unoview.hxx" -#include "smilfunctionparser.hxx" -#include "tools.hxx" +#include +#include +#include #include diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx index dfe0a94987ba..82356a9e3be7 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.hxx +++ b/slideshow/source/engine/transitions/clippingfunctor.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include "parametricpolypolygon.hxx" namespace slideshow diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx index a4b59218f9fa..3f2843bdbfc8 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -22,7 +22,7 @@ #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" -#include "basegfx/polygon/b2dpolygon.hxx" +#include namespace slideshow { diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 421e1f32c186..584c17b1c0f1 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.cxx @@ -22,7 +22,7 @@ #include #include #include "randomwipe.hxx" -#include "tools.hxx" +#include namespace slideshow { diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 9e98ab2a1561..e56bebccb03d 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -29,11 +29,11 @@ #include #include -#include "transitionfactory.hxx" +#include #include "transitionfactorytab.hxx" #include "transitiontools.hxx" #include "parametricpolypolygonfactory.hxx" -#include "animationfactory.hxx" +#include #include "clippingfunctor.hxx" using namespace ::com::sun::star; diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index fd9ba2f09abd..2bbec99404f3 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -27,7 +27,7 @@ #include #include "slidechangebase.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 6e8a97de21e2..9db000fc1106 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX -#include "unoview.hxx" -#include "vieweventhandler.hxx" -#include "numberanimation.hxx" -#include "slide.hxx" -#include "screenupdater.hxx" -#include "soundplayer.hxx" +#include +#include +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index b673b4912acb..2f7310410719 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -35,14 +35,14 @@ #include #include "slidechangebase.hxx" -#include "transitionfactory.hxx" +#include #include "transitionfactorytab.hxx" #include "transitiontools.hxx" #include "parametricpolypolygonfactory.hxx" -#include "animationfactory.hxx" +#include #include "clippingfunctor.hxx" #include "combtransition.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 629474d446cb..2e55b8471d7c 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -22,9 +22,9 @@ #include #include -#include "transitionfactory.hxx" +#include #include "transitionfactorytab.hxx" -#include "tools.hxx" +#include #include diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index e5bc35f39d32..c0f035761818 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -27,10 +27,10 @@ #include #include -#include "delayevent.hxx" -#include "usereventqueue.hxx" -#include "cursormanager.hxx" -#include "slideshowexceptions.hxx" +#include +#include +#include +#include #include #include diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 9198c6657ed4..d99de0052402 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -30,7 +30,7 @@ #include #include "waitsymbol.hxx" -#include "eventmultiplexer.hxx" +#include #include diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index 8da60e66def2..438437fc9330 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -23,10 +23,10 @@ #include #include -#include "vieweventhandler.hxx" -#include "screenupdater.hxx" -#include "eventmultiplexer.hxx" -#include "unoview.hxx" +#include +#include +#include +#include #include #include diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index 04f7fb7bbc4b..b876db457ebb 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATION_HXX #define INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATION_HXX -#include -#include -#include +#include "animatableshape.hxx" +#include "shapeattributelayer.hxx" +#include "disposable.hxx" /* Definition of Animation interface */ diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx index 147b24fa5925..71a6bc39e2c8 100644 --- a/slideshow/source/inc/numberanimation.hxx +++ b/slideshow/source/inc/numberanimation.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_NUMBERANIMATION_HXX #define INCLUDED_SLIDESHOW_SOURCE_INC_NUMBERANIMATION_HXX -#include +#include "animation.hxx" /* Definition of NumberAnimation interface */ -- cgit v1.2.3