loplugin:deletedspecial

Change-Id: I988d7cdfa048a3b093ebc34f9016ac42440daa4b

6 files changed, 30 insertions, 78 deletions

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index f2439da8966e..d028828c32fe 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -29,7 +29,7 @@ namespace basegfx {
 }
 class BitmapEx;
 
-/* Definition of internal::BitmapActionFactory class */
+/* Definition of internal::BitmapActionFactory */
 
 namespace cppcanvas
 {
@@ -44,29 +44,21 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class BitmapActionFactory
+        namespace BitmapActionFactory
         {
-        public:
             /// Unscaled bitmap action, only references destination point
-            static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
+            ActionSharedPtr createBitmapAction( const ::BitmapEx&,
                                                        const ::basegfx::B2DPoint& rDstPoint,
                                                        const CanvasSharedPtr&,
                                                        const OutDevState& );
 
             /// Scaled bitmap action, dest point and dest size
-            static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
+            ActionSharedPtr createBitmapAction( const ::BitmapEx&,
                                                        const ::basegfx::B2DPoint&  rDstPoint,
                                                        const ::basegfx::B2DVector& rDstSize,
                                                        const CanvasSharedPtr&,
                                                        const OutDevState& );
-
-        private:
-            // static factory, disable big four
-            BitmapActionFactory();
-            ~BitmapActionFactory();
-            BitmapActionFactory(const BitmapActionFactory&);
-            BitmapActionFactory& operator=( const BitmapActionFactory& );
-        };
+        }
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index a755c5964aed..5895feafbb66 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -28,7 +28,7 @@ namespace basegfx {
 }
 
 
-/* Definition of internal::LineActionFactory class */
+/* Definition of internal::LineActionFactory */
 
 namespace cppcanvas
 {
@@ -43,22 +43,14 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class LineActionFactory
+        namespace LineActionFactory
         {
-        public:
             /// Plain hair line from point 1 to point 2
-            static ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
+            ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
                                                      const ::basegfx::B2DPoint&,
                                                      const CanvasSharedPtr&,
                                                      const OutDevState& );
-
-        private:
-            // static factory, disable big four
-            LineActionFactory();
-            ~LineActionFactory();
-            LineActionFactory(const LineActionFactory&);
-            LineActionFactory& operator=( const LineActionFactory& );
-        };
+        }
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index f71ea9eaf8bf..4881ebd0d505 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -28,7 +28,7 @@ namespace basegfx {
     class B2DPoint;
 }
 
-/* Definition of internal::PointActionFactory class */
+/* Definition of internal::PointActionFactory */
 
 namespace cppcanvas
 {
@@ -43,27 +43,19 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class PointActionFactory
+        namespace PointActionFactory
         {
-        public:
             /// Point in current color
-            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
+            ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
                                                       const CanvasSharedPtr&,
                                                       const OutDevState& );
 
             /// Point in given color
-            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
+            ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
                                                       const CanvasSharedPtr&,
                                                       const OutDevState&,
                                                       const ::Color&        );
-
-        private:
-            // static factory, disable big four
-            PointActionFactory();
-            ~PointActionFactory();
-            PointActionFactory(const PointActionFactory&);
-            PointActionFactory& operator=( const PointActionFactory& );
-        };
+        }
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index a81e8738bb06..0cc3b64e3932 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace rendering
 } } } }
 
 
-/* Definition of internal::PolyPolyActionFactory class */
+/* Definition of internal::PolyPolyActionFactory */
 
 namespace cppcanvas
 {
@@ -49,44 +49,36 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class PolyPolyActionFactory
+        namespace PolyPolyActionFactory
         {
-        public:
             /// Create polygon, fill/stroke according to state
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+            ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&     );
 
             /// Create texture-filled polygon
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+            ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          const ::com::sun::star::rendering::Texture& );
 
             /// Create line polygon (always stroked, not filled)
-            static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+            ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                              const CanvasSharedPtr&,
                                                              const OutDevState& );
 
             /// Create stroked polygon
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+            ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          const ::com::sun::star::rendering::StrokeAttributes& );
 
             /// For transparent painting of the given polygon (normally, we take the colors always opaque)
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+            ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
                                                          int nTransparency );
-
-        private:
-            // static factory, disable big four
-            PolyPolyActionFactory();
-            ~PolyPolyActionFactory();
-            PolyPolyActionFactory(const PolyPolyActionFactory&);
-            PolyPolyActionFactory& operator=( const PolyPolyActionFactory& );
-        };
+        }
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 622360240cc1..8c1270ed2a51 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -33,7 +33,7 @@ class Size;
 class Color;
 
 
-/* Definition of internal::TextActionFactory class */
+/* Definition of internal::TextActionFactory */
 
 namespace cppcanvas
 {
@@ -48,9 +48,8 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class TextActionFactory
+        namespace TextActionFactory
         {
-        public:
             /** Create text action, optionally shadow/relief effect
 
                 Note that this method accepts all coordinates in
@@ -65,7 +64,7 @@ namespace cppcanvas
                 subsettable (Action::render( Subset ) works on
                 characters)
              */
-            static ActionSharedPtr createTextAction( const ::Point&                 rStartPoint,
+            ActionSharedPtr createTextAction( const ::Point&                 rStartPoint,
                                                      const ::Size&                  rReliefOffset,
                                                      const ::Color&                 rReliefColor,
                                                      const ::Size&                  rShadowOffset,
@@ -79,14 +78,7 @@ namespace cppcanvas
                                                      const OutDevState&             rState,
                                                      const Renderer::Parameters&    rParms,
                                                      bool                           bSubsettable );
-
-        private:
-            // static factory, disable big four
-            TextActionFactory();
-            ~TextActionFactory();
-            TextActionFactory(const TextActionFactory&);
-            TextActionFactory& operator=( const TextActionFactory& );
-        };
+        }
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 391daeb6f776..17978848e5b5 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -35,7 +35,7 @@ class GDIMetaFile;
 class Gradient;
 
 
-/* Definition of internal::TransparencyGroupActionFactory class */
+/* Definition of internal::TransparencyGroupActionFactory */
 
 namespace cppcanvas
 {
@@ -59,9 +59,8 @@ namespace cppcanvas
             handling, since a lot of the internal state (e.g. fonts,
             text layout) is Canvas-dependent.
          */
-        class TransparencyGroupActionFactory
+        namespace TransparencyGroupActionFactory
         {
-        public:
             /** Create new transparency group action.
 
                 @param rGroupMtf
@@ -83,21 +82,14 @@ namespace cppcanvas
                 Size of the transparency group object, in current
                 state coordinate system.
              */
-            static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&&                  rGroupMtf,
+            ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&&                  rGroupMtf,
                                                                   GradientAutoPtr&&             rAlphaGradient,
                                                                   const Renderer::Parameters&   rParms,
                                                                   const ::basegfx::B2DPoint&    rDstPoint,
                                                                   const ::basegfx::B2DVector&   rDstSize,
                                                                   const CanvasSharedPtr&        rCanvas,
                                                                   const OutDevState&            rState );
-
-        private:
-            // static factory, disable big four
-            TransparencyGroupActionFactory();
-            ~TransparencyGroupActionFactory();
-            TransparencyGroupActionFactory(const TransparencyGroupActionFactory&);
-            TransparencyGroupActionFactory& operator=( const TransparencyGroupActionFactory& );
-        };
+        }
     }
 }