improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

17 files changed, 11 insertions, 53 deletions

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 5f0fe81eda6d..07e38f60cc7d 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1527,10 +1527,6 @@ namespace cairocanvas
         return rv;
     }
 
-    uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice()
-    {
-        return uno::Reference< rendering::XGraphicDevice >(mpDevice);
-    }
 
     void CanvasHelper::copyRect( const rendering::XCanvas*                          ,
                                  const uno::Reference< rendering::XBitmapCanvas >&  /*sourceCanvas*/,
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index bbc48c63b0e3..4adcb3b57e72 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -208,7 +208,7 @@ namespace cairocanvas
                                  const ::com::sun::star::rendering::ViewState&      viewState,
                                  const ::com::sun::star::rendering::RenderState&    renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
-            getDevice();
+            getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); }
 
         // BitmapCanvasHelper functionality
         // ================================
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index e4677e6a085c..50d79ff23d64 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -271,11 +271,6 @@ namespace cairocanvas
         }
     }
 
-    SurfaceSharedPtr DeviceHelper::getSurface()
-    {
-        return mpSurface;
-    }
-
     SurfaceSharedPtr DeviceHelper::createSurface( const ::basegfx::B2ISize& rSize, Content aContent )
     {
         if( mpSurface )
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index 2d377c9c9a50..a4b739960e3b 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -92,7 +92,7 @@ namespace cairocanvas
         void dumpScreenContent() const;
 
         OutputDevice* getOutputDevice() const { return mpRefDevice; }
-        ::cairo::SurfaceSharedPtr getSurface();
+        ::cairo::SurfaceSharedPtr getSurface() { return mpSurface; }
         ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA );
         ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize );
 
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index b17ce9050c25..9673aec02f11 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -140,11 +140,6 @@ namespace cairocanvas
         setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) );
     }
 
-    SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface()
-    {
-        return mpBufferSurface;
-    }
-
     SurfaceSharedPtr SpriteDeviceHelper::getWindowSurface()
     {
         return DeviceHelper::getSurface();
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 4e4a9434655b..bcd9a8461762 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -64,7 +64,7 @@ namespace cairocanvas
         void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
         void setSize( const ::basegfx::B2ISize& rSize );
 
-        ::cairo::SurfaceSharedPtr getBufferSurface();
+        ::cairo::SurfaceSharedPtr getBufferSurface() { return mpBufferSurface; }
         ::cairo::SurfaceSharedPtr getWindowSurface();
         ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA );
         ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize );
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
index 5619d487312d..1a7ce4102362 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
@@ -46,10 +46,6 @@ namespace oglcanvas
         // TODO(F2): copyRect NYI
     }
 
-    geometry::IntegerSize2D BitmapCanvasHelper::getSize()
-    {
-        return maSize;
-    }
 
     uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/,
                                                                               bool                    /*beFast*/ )
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index 6fd7a4bcb49f..6e46ebe06f91 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -65,7 +65,7 @@ namespace oglcanvas
                        const ::com::sun::star::rendering::ViewState&        destViewState,
                        const ::com::sun::star::rendering::RenderState&      destRenderState );
 
-        ::com::sun::star::geometry::IntegerSize2D getSize();
+        ::com::sun::star::geometry::IntegerSize2D getSize() { return maSize; }
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
 
diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx
index 8e487ecaa3ee..ac2705319f59 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -72,10 +72,6 @@ namespace oglcanvas
         return rendering::FontMetrics();
     }
 
-    const ::com::sun::star::geometry::Matrix2D& CanvasFont::getFontMatrix() const
-    {
-        return maFontMatrix;
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 68e8e1e2b129..7eef59bdbbf6 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -55,7 +55,7 @@ namespace oglcanvas
         virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-        const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const;
+        const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const { return maFontMatrix; }
 
     private:
         ::com::sun::star::rendering::FontRequest    maFontRequest;
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index a1917dd0a33d..e9983f09fcb8 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -890,10 +890,6 @@ namespace oglcanvas
         return drawBitmap(pCanvas, xBitmap, viewState, renderState);
     }
 
-    uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice()
-    {
-        return uno::Reference< rendering::XGraphicDevice >(mpDevice);
-    }
 
     void CanvasHelper::setupGraphicsState( Action&                       o_action,
                                            const rendering::ViewState&   viewState,
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index 7b482e0df726..0dc98e00d798 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -179,7 +179,7 @@ namespace oglcanvas
                                  const ::com::sun::star::rendering::ViewState&      viewState,
                                  const ::com::sun::star::rendering::RenderState&    renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
-            getDevice();
+            getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); }
 
         // Flush drawing queue to screen
         void                    flush() const;
diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index 120dc9d2559d..92035174da5f 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.cxx
@@ -430,15 +430,7 @@ namespace canvas
         }
     }
 
-    ::basegfx::B2DPoint CanvasCustomSpriteHelper::getPosPixel() const
-    {
-        return maPosition;
-    }
 
-    ::basegfx::B2DVector CanvasCustomSpriteHelper::getSizePixel() const
-    {
-        return maSize;
-    }
 
     ::basegfx::B2DRange CanvasCustomSpriteHelper::getUpdateArea( const ::basegfx::B2DRange& rBounds ) const
     {
diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx
index aacf8a471e33..7f5d7769cc2c 100644
--- a/canvas/source/tools/pagemanager.cxx
+++ b/canvas/source/tools/pagemanager.cxx
@@ -205,10 +205,6 @@ namespace canvas
     // PageManager::getRenderModule
 
 
-    canvas::IRenderModuleSharedPtr PageManager::getRenderModule() const
-    {
-        return mpRenderModule;
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index 1307fa0167d5..5e906010e377 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -45,7 +45,7 @@ namespace canvas
         // accelerated page, e.g. OpenGL texture.
         ::basegfx::B2ISize getPageSize() const;
 
-        canvas::IRenderModuleSharedPtr getRenderModule() const;
+        canvas::IRenderModuleSharedPtr getRenderModule() const { return mpRenderModule; }
 
         FragmentSharedPtr allocateSpace( const ::basegfx::B2ISize& rSize );
         void              free( const FragmentSharedPtr& pFragment );
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 0bd3954f0885..4112c5b858b1 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -900,13 +900,6 @@ namespace vclcanvas
                                true );
     }
 
-    uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice()
-    {
-        // cast away const, need to change refcount (as this is
-        // ~invisible to client code, still logically const)
-        return uno::Reference< rendering::XGraphicDevice >(mpDevice);
-    }
-
     void CanvasHelper::copyRect( const rendering::XCanvas*                          ,
                                  const uno::Reference< rendering::XBitmapCanvas >&  ,
                                  const geometry::RealRectangle2D&                   ,
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 536b5de4d52c..6920c88f9b05 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -222,8 +222,11 @@ namespace vclcanvas
                                          ::com::sun::star::rendering::XBitmap >&        xBitmap,
                                  const ::com::sun::star::rendering::ViewState&      viewState,
                                  const ::com::sun::star::rendering::RenderState&    renderState );
+        // cast away const, need to change refcount (as this is
+        // ~invisible to client code, still logically const)
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
-            getDevice();
+            getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); }
+
 
         // BitmapCanvasHelper functionality
         // ================================