rtl::Reference fits just fine here

Change-Id: I268f6d2577b727c6aa072ee766b3f5f41bdb131b

8 files changed, 14 insertions, 30 deletions

diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 4469f59b4304..420e11bf7d4b 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -51,9 +49,7 @@ namespace cairocanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > Reference;
+        typedef rtl::Reference<CanvasFont> Reference;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                  fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties,
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 33b687c2da35..2eb7b0ce5cd1 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -125,7 +125,7 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        mpFont.reset();
+        mpFont.clear();
         mpRefDevice.clear();
     }
 
@@ -292,7 +292,7 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index 0049d2e6b0c6..ebb3d559af39 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -53,9 +51,7 @@ namespace dxcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > ImplRef;
+        typedef rtl::Reference<CanvasFont> ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 6ac0d70a888d..016a3309fd60 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -52,7 +52,7 @@ namespace dxcanvas
 
     void SAL_CALL TextLayout::disposing()
     {
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -112,7 +112,7 @@ namespace dxcanvas
             aDrawHelper.queryTextBounds(
                 maText,
                 maLogicalAdvancements,
-                mpFont.getRef(),
+                mpFont.get(),
                 mpFont->getFontMatrix()));
 
         return aBounds;
@@ -199,7 +199,7 @@ namespace dxcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException)
@@ -239,7 +239,7 @@ namespace dxcanvas
             rOutputOffset,
             maText,
             maLogicalAdvancements,
-            mpFont.getRef(),
+            mpFont.get(),
             mpFont->getFontMatrix(),
             bAlphaSurface);
 
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 7eef59bdbbf6..8946413ba631 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -37,9 +35,7 @@ namespace oglcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > ImplRef;
+        typedef rtl::Reference<CanvasFont> ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index a155c2c775f7..88e7ebdf37f4 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -35,7 +35,7 @@ namespace oglcanvas
 
     void SAL_CALL TextLayout::disposing()
     {
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -190,7 +190,7 @@ namespace oglcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index cb84b91af955..6285e93efe28 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -53,9 +51,7 @@ namespace vclcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > Reference;
+        typedef rtl::Reference<CanvasFont> Reference;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 9b0f89853f23..6cbb3d58df37 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -97,7 +97,7 @@ namespace vclcanvas
 
         mpOutDevProvider.reset();
         mxDevice.clear();
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -364,7 +364,7 @@ namespace vclcanvas
     {
         SolarMutexGuard aGuard;
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)