loplugin:staticmethods

Change-Id: I33a8ca28b0c3bf1c31758d93238e74927bebde9c

2 files changed, 7 insertions, 47 deletions

diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index 0cca17086d34..f72394be8252 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -44,28 +44,8 @@ using namespace ::com::sun::star;
 
 namespace cppcanvas
 {
-    /* Singleton handling */
-    struct InitInstance2
-    {
-        BaseGfxFactory* operator()()
-        {
-            return new BaseGfxFactory();
-        }
-    };
-
-    BaseGfxFactory& BaseGfxFactory::getInstance()
-    {
-        return *rtl_Instance< BaseGfxFactory, InitInstance2, ::osl::MutexGuard,
-            ::osl::GetGlobalMutex >::create(
-                InitInstance2(), ::osl::GetGlobalMutex());
-    }
-
-    BaseGfxFactory::BaseGfxFactory()
-    {
-    }
-
     PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr&          rCanvas,
-                                                            const ::basegfx::B2DPolygon&    rPoly ) const
+                                                            const ::basegfx::B2DPolygon&    rPoly )
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
                     rCanvas->getUNOCanvas().is(),
@@ -86,7 +66,7 @@ namespace cppcanvas
     }
 
     BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
-                                                  const ::basegfx::B2ISize& rSize ) const
+                                                  const ::basegfx::B2ISize& rSize )
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
                     rCanvas->getUNOCanvas().is(),
@@ -106,7 +86,7 @@ namespace cppcanvas
     }
 
     BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr&   rCanvas,
-                                                       const ::basegfx::B2ISize& rSize ) const
+                                                       const ::basegfx::B2ISize& rSize )
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
                     rCanvas->getUNOCanvas().is(),
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 0b5f7c33fd80..669aabfc16e3 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -39,26 +39,6 @@ using namespace ::com::sun::star;
 
 namespace cppcanvas
 {
-    /* Singleton handling */
-    struct InitInstance
-    {
-        VCLFactory* operator()()
-        {
-            return new VCLFactory();
-        }
-    };
-
-    VCLFactory& VCLFactory::getInstance()
-    {
-        return *rtl_Instance< VCLFactory, InitInstance, ::osl::MutexGuard,
-            ::osl::GetGlobalMutex >::create(
-                InitInstance(), ::osl::GetGlobalMutex());
-    }
-
-    VCLFactory::VCLFactory()
-    {
-    }
-
     CanvasSharedPtr VCLFactory::createCanvas( const uno::Reference< rendering::XCanvas >& xCanvas )
     {
         return CanvasSharedPtr(
@@ -71,7 +51,7 @@ namespace cppcanvas
             new internal::ImplBitmapCanvas( xCanvas ) );
     }
 
-    SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) const
+    SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow )
     {
         return SpriteCanvasSharedPtr(
             new internal::ImplSpriteCanvas(
@@ -80,14 +60,14 @@ namespace cppcanvas
                     uno::UNO_QUERY) ) );
     }
 
-    SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas ) const
+    SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas )
     {
         return SpriteCanvasSharedPtr(
             new internal::ImplSpriteCanvas( xCanvas ) );
     }
 
     BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
-                                              const ::BitmapEx&         rBmpEx ) const
+                                              const ::BitmapEx&         rBmpEx )
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
                     rCanvas->getUNOCanvas().is(),
@@ -108,7 +88,7 @@ namespace cppcanvas
 
     RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr&        rCanvas,
                                                   const ::GDIMetaFile&          rMtf,
-                                                  const Renderer::Parameters&   rParms ) const
+                                                  const Renderer::Parameters&   rParms )
     {
         return RendererSharedPtr( new internal::ImplRenderer( rCanvas,
                                                               rMtf,