loplugin:deletedspecial

Change-Id: I78acc6b7c56e79e2e4cc071efe95bfee94d73b7a

6 files changed, 32 insertions, 69 deletions

diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx
index 60c2268e9c2d..15466a517f9d 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.hxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/animations/TargetProperties.hpp>
 
-#include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <comphelper/sequence.hxx>
@@ -33,16 +32,10 @@ namespace slideshow
 {
     namespace internal
     {
-        class TargetPropertiesCreator : public ::comphelper::OBaseMutex
+        namespace TargetPropertiesCreator
         {
-            public:
-                static uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode );
-
-            private:
-                // default: disabled copy/assignment
-                TargetPropertiesCreator(const TargetPropertiesCreator&);
-                TargetPropertiesCreator& operator=( const TargetPropertiesCreator& );
-        };
+            uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode );
+        }
 
     } // namespace internal
 } // namespace slideshow
diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
index 8a1cfad0e3b6..2b188c4a1425 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PARAMETRICPOLYPOLYGONFACTORY_HXX
 
 #include "parametricpolypolygon.hxx"
-#include <boost/noncopyable.hpp>
 
 namespace slideshow
 {
@@ -29,17 +28,11 @@ namespace slideshow
     {
         /* Definition of Transitionfactory class */
 
-        class ParametricPolyPolygonFactory : private boost::noncopyable
+        namespace ParametricPolyPolygonFactory
         {
-        public:
-            static ParametricPolyPolygonSharedPtr createClipPolyPolygon( sal_Int16 nTransitionType,
+            ParametricPolyPolygonSharedPtr createClipPolyPolygon( sal_Int16 nTransitionType,
                                                                          sal_Int16 nTransitionSubType );
-
-        private:
-            // static factory
-            ParametricPolyPolygonFactory();
-            ~ParametricPolyPolygonFactory();
-        };
+        }
     }
 }
 
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx
index b0cf042e2b1a..4876f1a2cfa6 100644
--- a/slideshow/source/inc/activitiesfactory.hxx
+++ b/slideshow/source/inc/activitiesfactory.hxx
@@ -44,9 +44,8 @@
 namespace slideshow {
 namespace internal {
 
-class ActivitiesFactory : private ::boost::noncopyable
+namespace ActivitiesFactory
 {
-public:
     /// Collection of common factory parameters
     struct CommonParameters
     {
@@ -147,7 +146,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const NumberAnimationSharedPtr&                rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -170,7 +169,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const EnumAnimationSharedPtr&                  rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -193,7 +192,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const ColorAnimationSharedPtr&                 rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -216,7 +215,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                            rParms,
         const HSLColorAnimationSharedPtr&                  rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -239,7 +238,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const PairAnimationSharedPtr&                  rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -262,7 +261,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const StringAnimationSharedPtr&                rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -285,7 +284,7 @@ public:
         @param xNode
         The SMIL animation node to animate
     */
-    static AnimationActivitySharedPtr createAnimateActivity(
+    AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const BoolAnimationSharedPtr&                  rAnimator,
         const ::com::sun::star::uno::Reference<
@@ -308,16 +307,11 @@ public:
         If true, the activity goes 'forward', i.e. from 0 to
         1. With false, the direction is reversed.
     */
-    static AnimationActivitySharedPtr createSimpleActivity(
+    AnimationActivitySharedPtr createSimpleActivity(
         const CommonParameters&         rParms,
         const NumberAnimationSharedPtr& rAnimator,
         bool                            bDirectionForward );
-
-private:
-    // default: constructor/destructor disabed
-    ActivitiesFactory();
-    ~ActivitiesFactory();
-};
+}
 
 } // namespace internal
 } // namespace presentation
diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx
index 5741749db3dd..29c0613b8068 100644
--- a/slideshow/source/inc/animationfactory.hxx
+++ b/slideshow/source/inc/animationfactory.hxx
@@ -32,11 +32,6 @@
 #include "shapeattributelayer.hxx"
 #include "shapemanager.hxx"
 
-#include <boost/noncopyable.hpp>
-
-
-
-
 /* Definition of AnimationFactory class */
 
 namespace slideshow
@@ -50,9 +45,8 @@ namespace slideshow
             appropriate Animation object from that, which will modify
             the attribute as specified.
          */
-        class AnimationFactory : private boost::noncopyable
+        namespace AnimationFactory
         {
-        public:
             /** Classifies the attribute name.
 
                 This enum maps names to appropriate factory methods.
@@ -73,7 +67,7 @@ namespace slideshow
                 CLASS_BOOL_PROPERTY
             };
 
-            static AttributeClass classifyAttributeName( const OUString& rAttrName );
+            AttributeClass classifyAttributeName( const OUString& rAttrName );
 
             /// Collection of flags common to all factory methods
             enum FactoryFlags
@@ -85,19 +79,19 @@ namespace slideshow
                 FLAG_NO_SPRITE = 1
             };
 
-            static NumberAnimationSharedPtr createNumberPropertyAnimation( const OUString&               rAttrName,
+            NumberAnimationSharedPtr createNumberPropertyAnimation( const OUString&               rAttrName,
                                                                            const AnimatableShapeSharedPtr&      rShape,
                                                                            const ShapeManagerSharedPtr&         rShapeManager,
                                                                            const ::basegfx::B2DVector&          rSlideSize,
                                                                            int                                  nFlags=0 );
 
-            static EnumAnimationSharedPtr createEnumPropertyAnimation( const OUString&                   rAttrName,
+            EnumAnimationSharedPtr createEnumPropertyAnimation( const OUString&                   rAttrName,
                                                                        const AnimatableShapeSharedPtr&          rShape,
                                                                        const ShapeManagerSharedPtr&             rShapeManager,
                                                                        const ::basegfx::B2DVector&              rSlideSize,
                                                                        int                                      nFlags=0 );
 
-            static ColorAnimationSharedPtr  createColorPropertyAnimation( const OUString&                rAttrName,
+            ColorAnimationSharedPtr  createColorPropertyAnimation( const OUString&                rAttrName,
                                                                           const AnimatableShapeSharedPtr&       rShape,
                                                                           const ShapeManagerSharedPtr&          rShapeManager,
                                                                           const ::basegfx::B2DVector&           rSlideSize,
@@ -110,35 +104,31 @@ namespace slideshow
                 animations::AnimationTransformType::TRANSLATE or
                 animations::AnimationTransformType::SCALE.
              */
-            static PairAnimationSharedPtr   createPairPropertyAnimation( const AnimatableShapeSharedPtr&        rShape,
+            PairAnimationSharedPtr   createPairPropertyAnimation( const AnimatableShapeSharedPtr&        rShape,
                                                                          const ShapeManagerSharedPtr&           rShapeManager,
                                                                          const ::basegfx::B2DVector&            rSlideSize,
                                                                          sal_Int16                              nTransformType,
                                                                          int                                    nFlags=0 );
 
-            static StringAnimationSharedPtr createStringPropertyAnimation( const OUString&               rAttrName,
+            StringAnimationSharedPtr createStringPropertyAnimation( const OUString&               rAttrName,
                                                                            const AnimatableShapeSharedPtr&      rShape,
                                                                            const ShapeManagerSharedPtr&         rShapeManager,
                                                                            const ::basegfx::B2DVector&          rSlideSize,
                                                                            int                                  nFlags=0 );
 
-            static BoolAnimationSharedPtr   createBoolPropertyAnimation( const OUString&                 rAttrName,
+            BoolAnimationSharedPtr   createBoolPropertyAnimation( const OUString&                 rAttrName,
                                                                          const AnimatableShapeSharedPtr&        rShape,
                                                                          const ShapeManagerSharedPtr&           rShapeManager,
                                                                          const ::basegfx::B2DVector&            rSlideSize,
                                                                          int                                    nFlags=0 );
 
-            static NumberAnimationSharedPtr createPathMotionAnimation( const OUString&                   rSVGDPath,
+            NumberAnimationSharedPtr createPathMotionAnimation( const OUString&                   rSVGDPath,
                                                                        sal_Int16                                nAdditive,
                                                                        const AnimatableShapeSharedPtr&          rShape,
                                                                        const ShapeManagerSharedPtr&             rShapeManager,
                                                                        const ::basegfx::B2DVector&              rSlideSize,
                                                                        int                                      nFlags=0);
-        private:
-            // default: constructor/destructor disabed
-            AnimationFactory();
-            ~AnimationFactory();
-        };
+        }
     }
 }
 
diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx
index 3f53f9996076..e4dfe72d0c35 100644
--- a/slideshow/source/inc/animationnodefactory.hxx
+++ b/slideshow/source/inc/animationnodefactory.hxx
@@ -31,7 +31,6 @@
 #include "activitiesqueue.hxx"
 #include "usereventqueue.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <vector>
 
 
@@ -41,29 +40,23 @@ namespace slideshow
     {
         /* Definition of AnimationNodeFactory class */
 
-        class AnimationNodeFactory : private boost::noncopyable
+        namespace AnimationNodeFactory
         {
-        public:
             /** Create an AnimatioNode for the given XAnimationNode
              */
-            static AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference<
+            AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference<
                                                                        ::com::sun::star::animations::XAnimationNode >& xNode,
                                                                const ::basegfx::B2DVector&                          rSlideSize,
                                                                const SlideShowContext&                              rContext );
 
 
 #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
-            static void showTree( AnimationNodeSharedPtr& pRootNode );
+            void showTree( AnimationNodeSharedPtr& pRootNode );
 # define SHOW_NODE_TREE(a) AnimationNodeFactory::showTree(a)
 #else
 # define SHOW_NODE_TREE(a)
 #endif
-
-        private:
-            // default: constructor/destructor disabled
-            AnimationNodeFactory();
-            ~AnimationNodeFactory();
-        };
+        }
     }
 }
 
diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx
index 7a66df34b605..94d45988824b 100644
--- a/slideshow/source/inc/transitionfactory.hxx
+++ b/slideshow/source/inc/transitionfactory.hxx
@@ -131,8 +131,8 @@ namespace slideshow
                 sal_Int16                                               nTransitionSubType );
 
             // static factory
-            TransitionFactory();
-            ~TransitionFactory();
+            TransitionFactory() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+            ~TransitionFactory() SAL_DELETED_FUNCTION;
         };
     }
 }