diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index a38581856ed0..76e24509e6cd 100644
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.cxx
@@ -87,7 +87,7 @@ namespace dxcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) );
+        return new TextLayout(aText, nDirection, nRandomSeed, rtl::Reference<CanvasFont>(this));
     }
 
     uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  )
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index c5f369d00f5e..b507e3a350d7 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -48,7 +48,6 @@ namespace dxcanvas
                        public CanvasFont_Base
     {
     public:
-        typedef rtl::Reference<CanvasFont> ImplRef;
         /// make noncopyable
         CanvasFont(const CanvasFont&) = delete;
         const CanvasFont& operator=(const CanvasFont&) = delete;
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 7cad6691fb77..12f6710c8a37 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -527,8 +527,7 @@ namespace dxcanvas
                 Gdiplus::Color(
                     dxcanvastools::sequenceToArgb(renderState.DeviceColor)));
 
-            CanvasFont::ImplRef pFont(
-                dxcanvastools::canvasFontFromXFont(xFont) );
+            rtl::Reference<CanvasFont> pFont(dxcanvastools::canvasFontFromXFont(xFont));
 
             // Move glyphs up, such that output happens at the font
             // baseline.
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 12a1aa2b5634..bea95813d012 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -570,14 +570,14 @@ namespace dxcanvastools
             }
         }
 
-        CanvasFont::ImplRef canvasFontFromXFont( const uno::Reference< rendering::XCanvasFont >& xFont )
+        rtl::Reference<CanvasFont> canvasFontFromXFont(const uno::Reference<rendering::XCanvasFont>& xFont)
         {
             CanvasFont* pCanvasFont = dynamic_cast< CanvasFont* >(xFont.get());
 
             ENSURE_ARG_OR_THROW( pCanvasFont,
                              "canvasFontFromXFont(): Invalid XFont (or incompatible font for this XCanvas)" );
 
-            return CanvasFont::ImplRef( pCanvasFont );
+            return rtl::Reference<CanvasFont>(pCanvasFont);
         }
 
         void setModulateImageAttributes( Gdiplus::ImageAttributes& o_rAttr,
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 3bc5ec65ca27..d986f7e0a00a 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -113,7 +113,7 @@ using namespace dxcanvas;
 
         BitmapSharedPtr bitmapFromXBitmap( const css::uno::Reference< css::rendering::XBitmap >&  xBitmap );
 
-        CanvasFont::ImplRef canvasFontFromXFont( const css::uno::Reference< css::rendering::XCanvasFont >& xFont );
+        rtl::Reference<CanvasFont> canvasFontFromXFont(const css::uno::Reference<css::rendering::XCanvasFont>& xFont);
 
         void setModulateImageAttributes( Gdiplus::ImageAttributes& o_rAttr,
                                          double                           nRedModulation,
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index e64dde596693..2600d3736026 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -36,7 +36,7 @@ namespace dxcanvas
     TextLayout::TextLayout( const rendering::StringContext&     aText,
                             sal_Int8                            nDirection,
                             sal_Int64                           /*nRandomSeed*/,
-                            const CanvasFont::ImplRef&          rFont ) :
+                            const rtl::Reference<CanvasFont>& rFont) :
         TextLayout_Base( m_aMutex ),
         maText( aText ),
         maLogicalAdvancements(),
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index f0ae523e7b6a..88867aa2be6d 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -47,7 +47,7 @@ namespace dxcanvas
         TextLayout( const css::rendering::StringContext& aText,
                     sal_Int8                                                  nDirection,
                     sal_Int64                                                 nRandomSeed,
-                    const CanvasFont::ImplRef&                                rFont );
+                    const rtl::Reference<CanvasFont>& rFont);
         /// make noncopyable
         TextLayout(const TextLayout&) = delete;
         const TextLayout& operator=(const TextLayout&) = delete;
@@ -98,7 +98,7 @@ namespace dxcanvas
         css::rendering::StringContext              maText;
         css::uno::Sequence< double >               maLogicalAdvancements;
         css::uno::Sequence< sal_Bool >             maKashidaPositions;
-        CanvasFont::ImplRef                        mpFont;
+        rtl::Reference<CanvasFont> mpFont;
         sal_Int8                                   mnTextDirection;
     };
 
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 60a363261d3c..17f5faa20d6c 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -130,7 +130,7 @@ namespace dxcanvas
             aFont.SetColor( aColor );
             aFont.SetFillColor( aColor );
 
-            CanvasFont::ImplRef pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
+            rtl::Reference<CanvasFont> pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
             if (pFont.is() && pFont->getEmphasisMark())
                 aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
 
@@ -278,7 +278,7 @@ namespace dxcanvas
             aFont.SetFontWidth( nNewWidth );
         }
 
-        CanvasFont::ImplRef pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
+        rtl::Reference<CanvasFont> pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
         if (pFont.is() && pFont->getEmphasisMark())
             aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
 
diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx
index 6c0881af0f6c..82314b7440ed 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -36,7 +36,7 @@ namespace oglcanvas
     {
         std::unique_lock aGuard( m_aMutex );
 
-        return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) );
+        return new TextLayout(aText, nDirection, nRandomSeed, rtl::Reference<CanvasFont>(this));
     }
 
     rendering::FontRequest SAL_CALL CanvasFont::getFontRequest(  )
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index ce210e953fee..74b2b53ad640 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -26,8 +26,6 @@ namespace oglcanvas
     class CanvasFont : public CanvasFontBase
     {
     public:
-        typedef rtl::Reference<CanvasFont> ImplRef;
-
         /// make noncopyable
         CanvasFont(const CanvasFont&) = delete;
         const CanvasFont& operator=(const CanvasFont&) = delete;
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index 1bcf1a9fbaf7..c4483c2f29c4 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -22,7 +22,7 @@ namespace oglcanvas
     TextLayout::TextLayout( rendering::StringContext      aText,
                             sal_Int8                      nDirection,
                             sal_Int64                     /*nRandomSeed*/,
-                            CanvasFont::ImplRef           rFont ) :
+                            rtl::Reference<CanvasFont> rFont) :
         maText(std::move( aText )),
         mpFont(std::move( rFont )),
         mnTextDirection( nDirection )
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index d913ec3fb368..07d2a79c44dd 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -28,7 +28,7 @@ namespace oglcanvas
         TextLayout( css::rendering::StringContext               aText,
                     sal_Int8                                    nDirection,
                     sal_Int64                                   nRandomSeed,
-                    CanvasFont::ImplRef                         rFont );
+                    rtl::Reference<CanvasFont> rFont);
 
         /// make noncopyable
         TextLayout(const TextLayout&) = delete;
@@ -62,7 +62,7 @@ namespace oglcanvas
         css::rendering::StringContext              maText;
         css::uno::Sequence< double >               maLogicalAdvancements;
         css::uno::Sequence< sal_Bool >             maKashidaPositions;
-        CanvasFont::ImplRef                        mpFont;
+        rtl::Reference<CanvasFont> mpFont;
         sal_Int8                                   mnTextDirection;
     };