Use getXWeak in canvas

Change-Id: I51b4c20eadc594057d5384bff51b4547da86129d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150837
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

10 files changed, 11 insertions, 20 deletions

diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 60b807e8196b..1a16a9f813cb 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -176,15 +176,13 @@ com_sun_star_comp_rendering_Canvas_Cairo_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
 {
     rtl::Reference<cairocanvas::Canvas> p = new cairocanvas::Canvas(args, context);
-    p->acquire();
     try {
         p->initialize();
     } catch (css::uno::Exception&) {
         p->dispose();
-        p->release();
         throw;
     }
-    return static_cast<cppu::OWeakObject*>(p.get());
+    return cppu::acquire(p.get());
 }
 
 
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 74b2ce5892b6..5af40370c57f 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -225,9 +225,8 @@ com_sun_star_comp_rendering_SpriteCanvas_Cairo_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
 {
     rtl::Reference<cairocanvas::SpriteCanvas> p = new cairocanvas::SpriteCanvas(args, context);
-    p->acquire();
     p->initialize();
-    return static_cast<cppu::OWeakObject*>(p.get());
+    return cppu::acquire(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 00a1d19d5577..955a180330d4 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -125,7 +125,7 @@ namespace cairocanvas
         if( aAdvancements.getLength() != maText.Length )
         {
             SAL_WARN("canvas.cairo", "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
-            throw lang::IllegalArgumentException("mismatching number of advancements", static_cast<cppu::OWeakObject*>(this), 1);
+            throw lang::IllegalArgumentException("mismatching number of advancements", getXWeak(), 1);
         }
 
         maLogicalAdvancements = aAdvancements;
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index fbf0f8490071..c19ea1ea9017 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -240,8 +240,7 @@ namespace dxcanvas
     {
         rtl::Reference<Canvas> xCanvas(new Canvas(args, context));
         xCanvas->initialize();
-        xCanvas->acquire();
-        return static_cast<cppu::OWeakObject*>(xCanvas.get());
+        return cppu::acquire(xCanvas.get());
     }
 
     extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
@@ -250,8 +249,7 @@ namespace dxcanvas
     {
         rtl::Reference<BitmapCanvas> xCanvas(new BitmapCanvas(args, context));
         xCanvas->initialize();
-        xCanvas->acquire();
-        return static_cast<cppu::OWeakObject*>(xCanvas.get());
+        return cppu::acquire(xCanvas.get());
     }
 }
 
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 5f1a68b34515..f4fe39203f4b 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -183,8 +183,7 @@ namespace dxcanvas
     {
         rtl::Reference<SpriteCanvas> xCanvas(new SpriteCanvas(args, context));
         xCanvas->initialize();
-        xCanvas->acquire();
-        return static_cast<cppu::OWeakObject*>(xCanvas.get());
+        return cppu::acquire(xCanvas.get());
     }
 
 }
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 4ed0a267476c..24d18945bede 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -80,7 +80,7 @@ namespace dxcanvas
         catch (...) {
 
             throw lang::NoSupportException( "Could not create DirectX device!",
-                static_cast< ::cppu::OWeakObject* >(&rSpriteCanvas) );
+                rSpriteCanvas.getXWeak() );
         }
 
         // create the surfaceproxy manager
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 743712e95e96..b8ee8a5cb807 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -69,7 +69,7 @@ namespace oglcanvas
     {
         canvas::tools::verifyArgs(aNewPos, viewState, renderState,
                                   __func__,
-                                  static_cast< ::cppu::OWeakObject* >(this));
+                                  getXWeak());
 
         ::osl::MutexGuard aGuard( m_aMutex );
         ::basegfx::B2DHomMatrix aTransform;
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 7b7f6b8b48cc..2b9588667517 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -159,9 +159,8 @@ com_sun_star_comp_rendering_SpriteCanvas_OGL_get_implementation(
     if( !OpenGLHelper::supportsOpenGL())
         return nullptr;
     rtl::Reference<oglcanvas::SpriteCanvas> p = new oglcanvas::SpriteCanvas(args, context);
-    cppu::acquire(p.get());
     p->initialize();
-    return static_cast<cppu::OWeakObject*>(p.get());
+    return cppu::acquire(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index ac73acd96a8f..9408a4dbb66c 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -127,9 +127,8 @@ com_sun_star_comp_rendering_Canvas_VCL_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
 {
     rtl::Reference<vclcanvas::Canvas> p = new vclcanvas::Canvas(args, context);
-    cppu::acquire(p.get());
     p->initialize();
-    return static_cast<cppu::OWeakObject*>(p.get());
+    return cppu::acquire(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index f67783681417..cbe0fa8dc791 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -179,9 +179,8 @@ com_sun_star_comp_rendering_SpriteCanvas_VCL_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
 {
     rtl::Reference<vclcanvas::SpriteCanvas> p = new vclcanvas::SpriteCanvas(args, context);
-    cppu::acquire(p.get());
     p->initialize();
-    return static_cast<cppu::OWeakObject*>(p.get());
+    return cppu::acquire(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */