diff options
Diffstat (limited to 'slideshow/source/engine/shapes')
14 files changed, 14 insertions, 54 deletions
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 37f7b22be047..20d9a08b52e7 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -29,10 +29,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { namespace { /** Represents an applet shape. @@ -282,7 +280,6 @@ namespace slideshow nNumPropEntries, rContext); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index dde159ca477f..88d48b7e72e9 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -35,10 +35,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { namespace { /** Representation of a draw document's background shape. @@ -293,7 +291,6 @@ namespace slideshow xMasterPage, rContext ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 46bbb7efd2cb..9d61fb383e42 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -899,8 +899,7 @@ void ActivityImpl::end() } // anon namespace -namespace slideshow { -namespace internal { +namespace slideshow::internal { std::shared_ptr<Activity> createDrawingLayerAnimActivity( SlideShowContext const& rContext, @@ -928,7 +927,6 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity( return pActivity; } -} // namespace internal } // namespace presentation /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index f4a541ecd907..e8fcd0299ab3 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -49,10 +49,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { // Private methods @@ -1197,7 +1195,6 @@ namespace slideshow { return maSubsetting.getSubsetTreeNode( rParentNode, nNodeIndex, eNodeType ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 4bc51e2dc08d..05cc539c1cd0 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -35,10 +35,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { // Private methods @@ -805,7 +803,6 @@ namespace slideshow } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 52b617ebf8c3..aeff0f412cc9 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -32,10 +32,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { class ExternalShapeBase::ExternalShapeBaseListener : public ViewEventHandler, public IntrinsicAnimationEventHandler { @@ -207,7 +205,6 @@ namespace slideshow return true; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 3a06b8002dd7..247206adcd36 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -45,9 +45,7 @@ using namespace ::com::sun::star; // free support functions // ====================== -namespace slideshow -{ -namespace internal +namespace slideshow::internal { // TODO(E2): Detect the case when svx/drawing layer is not // in-process, or even not on the same machine, and @@ -426,6 +424,5 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 3fe1d59ce8d7..a8a46f7ba050 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -27,10 +27,8 @@ #include <memory> -namespace slideshow +namespace slideshow::internal { - namespace internal - { namespace { /** Activity for intrinsic shape animations @@ -246,7 +244,6 @@ namespace slideshow rTimeouts, nNumLoops); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index bd2522899156..55c302bc683c 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -33,10 +33,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { namespace { /** Represents a media shape. @@ -244,7 +242,6 @@ namespace slideshow return std::make_shared<MediaShape>(xShape, nPrio, rContext); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 06ac4275af1d..b1b1b3417269 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -47,8 +47,7 @@ using namespace com::sun::star; -namespace slideshow { -namespace internal { +namespace slideshow::internal { namespace { @@ -533,7 +532,6 @@ ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const& maShapesStack.push( XShapesEntry(xShapes) ); } -} // namespace internal } // namespace presentation /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 756ac85d7637..736cb9d94c65 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -49,10 +49,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, const uno::Reference< drawing::XShape >& rxShape, const OUString& rServiceName, @@ -255,7 +253,6 @@ namespace slideshow return true; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 97e861e9e445..e0ca333adee2 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -40,10 +40,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, const GDIMetaFileSharedPtr& rMtf ) const @@ -185,7 +183,6 @@ namespace slideshow return true; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 3e8056fa8539..d2a92580aeef 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -51,10 +51,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { ViewMediaShape::ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< uno::XComponentContext >& rxContext ) : @@ -469,7 +467,6 @@ namespace slideshow TOOLS_WARN_EXCEPTION( "slideshow", "" ); } } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 5df9650b4cc7..4b69c4320c45 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -42,10 +42,8 @@ using namespace ::com::sun::star; -namespace slideshow +namespace slideshow::internal { - namespace internal - { // TODO(F2): Provide sensible setup for mtf-related attributes (fill mode, // char rotation etc.). Do that via mtf argument at this object @@ -853,7 +851,6 @@ namespace slideshow bIsVisible ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |