diff options
Diffstat (limited to 'slideshow/source/engine/shapes')
12 files changed, 17 insertions, 48 deletions
diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index 49bc81f822fa..0de63af2c484 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -25,10 +25,8 @@ namespace com::sun::star::drawing { class XShape; } -namespace slideshow +namespace slideshow::internal { - namespace internal - { struct SlideShowContext; class Shape; @@ -39,7 +37,6 @@ namespace slideshow const char** pPropCopyTable, std::size_t nNumPropEntries, const SlideShowContext& rContext ); - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_APPLETSHAPE_HXX diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx index 988dba08a22a..3e709249841f 100644 --- a/slideshow/source/engine/shapes/backgroundshape.hxx +++ b/slideshow/source/engine/shapes/backgroundshape.hxx @@ -26,9 +26,7 @@ namespace com::sun::star::drawing { class XDrawPage; } -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class Shape; struct SlideShowContext; @@ -45,7 +43,7 @@ namespace slideshow const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_BACKGROUNDSHAPE_HXX diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.hxx b/slideshow/source/engine/shapes/drawinglayeranimation.hxx index 523108e3ebb7..5a143b087de1 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.hxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.hxx @@ -22,8 +22,7 @@ #include <sal/config.h> #include <memory> -namespace slideshow { -namespace internal { +namespace slideshow::internal { class Activity; struct SlideShowContext; @@ -33,8 +32,7 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity( SlideShowContext const& rContext, std::shared_ptr<DrawShape> const& pDrawShape ); -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // ! defined INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWINGLAYERANIMATION_HXX diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index e4def440fe3d..eb9030affde0 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -35,9 +35,7 @@ class Graphic; -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class Activity; struct SlideShowContext; @@ -352,7 +350,7 @@ namespace slideshow bool mbDrawingLayerAnim; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPE_HXX diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index f9ea3f4d5981..fe0347774348 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -27,9 +27,7 @@ class GDIMetaFile; typedef ::std::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr; -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class encapsulates the subsetting aspects of a DrawShape. @@ -239,7 +237,6 @@ namespace slideshow mutable bool mbNodeTreeInitialized; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index 6b455e387f07..260d8630e170 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -25,9 +25,7 @@ #include <slideshowcontext.hxx> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Base class for shapes rendered by external engines. @@ -124,7 +122,6 @@ namespace slideshow const double mnPriority; ::basegfx::B2DRectangle maBounds; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index d63a60f7a74e..7812301f97e6 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -36,9 +36,7 @@ class GDIMetaFile; class Graphic; -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /// meta file loading specialities: enum mtf_load_flags { @@ -124,7 +122,6 @@ namespace slideshow bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, ::basegfx::B2DRectangle& o_rPaintRect, const GDIMetaFileSharedPtr& rMtf ); - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_GDIMTFTOOLS_HXX diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx index aeef925a3c7a..e5306b671788 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx @@ -27,9 +27,7 @@ /* Definition of IntrinsicAnimationActivity class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Create an IntrinsicAnimationActivity. @@ -60,7 +58,7 @@ namespace slideshow const WakeupEventSharedPtr& rWakeupEvent, const ::std::vector<double>& rTimeouts, sal_uInt32 nNumLoops); - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_INTRINSICANIMATIONACTIVITY_HXX diff --git a/slideshow/source/engine/shapes/mediashape.hxx b/slideshow/source/engine/shapes/mediashape.hxx index 44667cd21018..4b2a542eeab2 100644 --- a/slideshow/source/engine/shapes/mediashape.hxx +++ b/slideshow/source/engine/shapes/mediashape.hxx @@ -26,10 +26,8 @@ namespace com::sun::star::drawing { class XShape; } -namespace slideshow +namespace slideshow::internal { - namespace internal - { struct SlideShowContext; class Shape; typedef ::std::shared_ptr< Shape > ShapeSharedPtr; @@ -38,7 +36,7 @@ namespace slideshow const css::uno::Reference<css::drawing::XShape >& xShape, double nPrio, const SlideShowContext& rContext); - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_MEDIASHAPE_HXX diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index 2bdf4b49e3aa..0f5b296465aa 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -32,9 +32,7 @@ #include <viewlayer.hxx> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class is the viewable representation of a draw document's background, associated to a specific View @@ -91,7 +89,6 @@ namespace slideshow typedef ::std::shared_ptr< ViewBackgroundShape > ViewBackgroundShapeSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWBACKGROUNDSHAPE_HXX diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 549e3902228a..de46f194746a 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -48,9 +48,7 @@ namespace com::sun::star { } } -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class is the viewable representation of a draw document's media object, associated to a specific View @@ -163,7 +161,6 @@ namespace slideshow typedef ::std::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWMEDIASHAPE_HXX diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index a59dc0f2a2a7..c7e1d564cba0 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -51,9 +51,7 @@ namespace o3tl { -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class is the viewable representation of a draw document's XShape, associated to a specific View @@ -314,7 +312,6 @@ namespace slideshow typedef ::std::shared_ptr< ViewShape > ViewShapeSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWSHAPE_HXX |