6 files changed, 3 insertions, 15 deletions
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;