diff options
Diffstat (limited to 'slideshow/source/engine/shapes')
23 files changed, 14 insertions, 122 deletions
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 1fac5a42739d..f3b8edc9c02c 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -18,11 +18,8 @@ */ -#include <canvas/canvastools.hxx> - #include "appletshape.hxx" #include "externalshapebase.hxx" -#include <vieweventhandler.hxx> #include "viewappletshape.hxx" #include <tools.hxx> diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 704e7cb9598e..adc550662298 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -18,20 +18,11 @@ */ -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <vcl/metaact.hxx> -#include <vcl/gdimtf.hxx> - -#include <basegfx/numeric/ftools.hxx> #include <sal/log.hxx> -#include <cmath> #include <algorithm> -#include <functional> -#include <limits> #include "backgroundshape.hxx" #include <slideshowexceptions.hxx> diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx index c7ff134e0dc5..0ded09bd8983 100644 --- a/slideshow/source/engine/shapes/backgroundshape.hxx +++ b/slideshow/source/engine/shapes/backgroundshape.hxx @@ -22,6 +22,8 @@ #include <com/sun/star/uno/Reference.hxx> +#include <memory> + namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index ef931979c643..b8b500936557 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -19,25 +19,15 @@ #include <tools/diagnose_ex.h> +#include <tools/gen.hxx> #include <tools/helpers.hxx> #include <canvas/elapsedtime.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> - -#include <rtl/math.hxx> -#include <sal/log.hxx> -#include <vcl/metric.hxx> #include <vcl/canvastools.hxx> -#include <vcl/metaact.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextAnimationKind.hpp> #include <com/sun/star/drawing/TextAnimationDirection.hpp> -#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/HomogenMatrix3.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <activity.hxx> #include <wakeupevent.hxx> @@ -45,13 +35,11 @@ #include "drawinglayeranimation.hxx" #include "drawshapesubsetting.hxx" #include "drawshape.hxx" -#include <shapesubset.hxx> #include <shapeattributelayerholder.hxx> #include <slideshowcontext.hxx> +#include <subsettableshapemanager.hxx> #include <tools.hxx> #include "gdimtftools.hxx" -#include <eventmultiplexer.hxx> -#include "intrinsicanimationactivity.hxx" #include <intrinsicanimationeventhandler.hxx> #include <vector> diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.hxx b/slideshow/source/engine/shapes/drawinglayeranimation.hxx index 3ebd45e1f766..523108e3ebb7 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.hxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWINGLAYERANIMATION_HXX #include <sal/config.h> +#include <memory> namespace slideshow { namespace internal { diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 0bad87a71055..a09dd07e19f0 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -19,13 +19,8 @@ #include <tools/diagnose_ex.h> -#include <osl/diagnose.hxx> #include <sal/log.hxx> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> @@ -33,24 +28,13 @@ #include <basegfx/numeric/ftools.hxx> -#include <rtl/math.hxx> - #include <com/sun/star/drawing/TextAnimationKind.hpp> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <tools/stream.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/datatransfer/XTransferable.hpp> - #include <comphelper/scopeguard.hxx> -#include <canvas/canvastools.hxx> -#include <cmath> #include <algorithm> #include <iterator> #include <functional> -#include <limits> #include "drawshapesubsetting.hxx" #include "drawshape.hxx" @@ -58,13 +42,10 @@ #include <wakeupevent.hxx> #include <subsettableshapemanager.hxx> #include "intrinsicanimationactivity.hxx" -#include <slideshowexceptions.hxx> #include <tools.hxx> #include "gdimtftools.hxx" #include "drawinglayeranimation.hxx" -#include <math.h> - using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index e76fe9c115a0..a7bfa8812032 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -25,12 +25,12 @@ #include <attributableshape.hxx> #include <doctreenodesupplier.hxx> +#include "drawshapesubsetting.hxx" #include "gdimtftools.hxx" #include "viewshape.hxx" #include <hyperlinkarea.hxx> #include <o3tl/optional.hxx> -#include <set> #include <vector> class Graphic; diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index cca217a0a59c..08f2dbba9481 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -20,20 +20,15 @@ #include <tools/diagnose_ex.h> -#include <rtl/math.hxx> - #include <sal/log.hxx> #include <utility> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <basegfx/numeric/ftools.hxx> #include "drawshapesubsetting.hxx" -#include "drawshape.hxx" +#include "gdimtftools.hxx" #include <algorithm> -#include <functional> -#include <limits> using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 6e557bb456de..fef7cef6d5d4 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -20,13 +20,10 @@ // must be first #include <tools/diagnose_ex.h> -#include <sal/log.hxx> - -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> #include "externalshapebase.hxx" #include <eventmultiplexer.hxx> +#include <subsettableshapemanager.hxx> #include <vieweventhandler.hxx> #include <intrinsicanimationeventhandler.hxx> #include <tools.hxx> diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index bdefea769408..f539d554e064 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -20,12 +20,8 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX -#include <vector> - #include <iexternalmediashapebase.hxx> #include <unoview.hxx> -#include <subsettableshapemanager.hxx> -#include <slideshowexceptions.hxx> #include <slideshowcontext.hxx> diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index cb1b9b4617a5..a85a9cdc796c 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -18,15 +18,11 @@ */ -#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include "gdimtftools.hxx" -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphicRenderer.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <cppuhelper/basemutex.hxx> @@ -34,8 +30,6 @@ #include <comphelper/fileformat.h> -#include <tools/stream.hxx> -#include <vcl/svapp.hxx> #include <vcl/canvastools.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> @@ -43,8 +37,6 @@ #include <vcl/animate/Animation.hxx> #include <vcl/graph.hxx> -#include <unotools/streamwrap.hxx> - #include <tools.hxx> using namespace ::com::sun::star; diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index cf3748f4a4d5..de0bc4e5a2ea 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -20,10 +20,8 @@ #include <tools/diagnose_ex.h> -#include "drawshapesubsetting.hxx" #include <subsettableshapemanager.hxx> #include <eventqueue.hxx> -#include <eventmultiplexer.hxx> #include "intrinsicanimationactivity.hxx" #include <intrinsicanimationeventhandler.hxx> diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx index 5cc660078895..aeef925a3c7a 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx @@ -24,7 +24,6 @@ #include <activity.hxx> #include <slideshowcontext.hxx> #include "drawshape.hxx" -#include <tools.hxx> /* Definition of IntrinsicAnimationActivity class */ diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index 17a82c4392a1..9aa9009a9002 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -18,8 +18,6 @@ */ -#include <canvas/canvastools.hxx> - #include <com/sun/star/drawing/XShape.hpp> #include "mediashape.hxx" diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 542308813d36..c3b681017106 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/cvtgrf.hxx> #include <vcl/GraphicObject.hxx> -#include <tools/urlobj.hxx> -#include <tools/stream.hxx> -#include <unotools/streamwrap.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <cppcanvas/basegfxfactory.hxx> @@ -29,27 +25,23 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/drawing/ColorMode.hpp> #include <com/sun/star/text/GraphicCrop.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/PointSequence.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/drawing/XLayerSupplier.hpp> #include <com/sun/star/drawing/XLayerManager.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include "drawshapesubsetting.hxx" #include "drawshape.hxx" #include "backgroundshape.hxx" #include "mediashape.hxx" #include "appletshape.hxx" #include <shapeimporter.hxx> #include <slideshowexceptions.hxx> -#include "gdimtftools.hxx" #include <tools.hxx> #include <slideshowcontext.hxx> +#include <unoviewcontainer.hxx> #include <memory> diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 4f8c86bce467..756ac85d7637 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -19,21 +19,17 @@ #include <tools/diagnose_ex.h> -#include <sal/log.hxx> - -#include <cppuhelper/exc_hlp.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/utils/canvastools.hxx> -#include <cppcanvas/spritecanvas.hxx> +#include <cppcanvas/canvas.hxx> #include <canvas/canvastools.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index d54ad064a41e..66336148c87b 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWAPPLETSHAPE_HXX #include <basegfx/range/b2drectangle.hxx> -#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <memory> diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index cdfd10bad100..97e861e9e445 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -25,13 +25,6 @@ #include "viewbackgroundshape.hxx" #include <tools.hxx> -#include <rtl/math.hxx> - -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> - -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index fa61459889d8..f9da137e2f47 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -25,11 +25,10 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <cppcanvas/spritecanvas.hxx> #include <memory> -#include "gdimtftools.hxx" +#include <tools.hxx> #include <viewlayer.hxx> diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 057b508437ae..e68cdf2b543a 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -21,48 +21,31 @@ #include <tools/diagnose_ex.h> -#include <math.h> - -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> - #include <sal/log.hxx> #include <vcl/canvastools.hxx> #include <vcl/syschild.hxx> -#include <vcl/sysdata.hxx> #include <vcl/window.hxx> #include <vcl/graph.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2irange.hxx> #include <canvas/canvastools.hxx> -#include <cppcanvas/vclfactory.hxx> -#include <cppcanvas/basegfxfactory.hxx> +#include <cppcanvas/canvas.hxx> #include <avmedia/mediawindow.hxx> -#if HAVE_FEATURE_OPENGL -#include <vcl/opengl/OpenGLContext.hxx> -#endif - #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/media/XManager.hpp> #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/media/XPlayerWindow.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include "viewmediashape.hxx" -#include "mediashape.hxx" #include <tools.hxx> #include <unoview.hxx> diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 53fc804d4633..f1bd23644823 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -22,6 +22,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <memory> #include <vcl/vclptr.hxx> diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index c3b676d6ec41..8426503671f1 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -22,19 +22,13 @@ #include <tools/diagnose_ex.h> #include <algorithm> -#include <math.h> #include <rtl/math.hxx> #include <sal/log.hxx> -#include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/rendering/PanoseLetterForm.hpp> #include <com/sun/star/awt/FontSlant.hpp> -#include <cppuhelper/exc_hlp.hxx> - -#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index b3fc29d27a2d..2dc4255aafe5 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -24,7 +24,6 @@ #include <cppcanvas/bitmap.hxx> #include <basegfx/range/b2drectangle.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <o3tl/typed_flags_set.hxx> #include <tools.hxx> |