[Libreoffice-commits] core.git: canvas/source

[Noel (via logerrit)]

 canvas/source/cairo/cairo_spritehelper.cxx |    5 ++---
 canvas/source/cairo/cairo_textlayout.cxx   |    2 +-
 canvas/source/opengl/ogl_textlayout.cxx    |    2 +-
 canvas/source/vcl/textlayout.cxx           |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f573d410e8673cd4f3eb772c6f7c2756bdc42e3e
Author:     Noel <noel.grandin at collabora.co.uk>
AuthorDate: Tue Feb 16 19:59:17 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 17 07:45:37 2021 +0100

    loplugin:referencecasting in canvas
    
    Change-Id: Ic802d6593db053bb31c3463e67b63399b5f26d67
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111001
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index 1fe9eb9152e0..929ecdf3b384 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -52,8 +52,7 @@ namespace cairocanvas
         mbTextureDirty     = true;
 
         // also init base class
-        CanvasCustomSpriteHelper::init( rSpriteSize,
-                                        rSpriteCanvas.get() );
+        CanvasCustomSpriteHelper::init( rSpriteSize, rSpriteCanvas );
     }
 
     void SpriteHelper::setSurface( const SurfaceSharedPtr& pBufferSurface )
@@ -131,7 +130,7 @@ namespace cairocanvas
                     rClip ));
 
             doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(),
-                                         nullptr, SurfaceProviderRef(mpSpriteCanvas.get()),
+                                         nullptr, SurfaceProviderRef(mpSpriteCanvas),
                                          rClip->getFillRule() );
         }
 
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 4094bd605e47..2f7abea5352f 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -237,7 +237,7 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.get();
+        return mpFont;
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  )
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index 89e7a16a681f..622a78320f08 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -165,7 +165,7 @@ namespace oglcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.get();
+        return mpFont;
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  )
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 2a0e1fec1a70..4bdda37d9613 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -313,7 +313,7 @@ namespace vclcanvas
     {
         SolarMutexGuard aGuard;
 
-        return mpFont.get();
+        return mpFont;
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  )