From ccf47bd943bf8d09e60fd3310ba31d550e744765 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Tue, 14 Jan 2014 13:05:02 -0200
Subject: fdo#54938: Convert canvas to cppu::supportsService

Final part

Change-Id: I5ff8e4aacf7be7c0cb1eab520f01cc312143641e
---
 canvas/source/directx/dx_canvasbitmap.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'canvas/source/directx/dx_canvasbitmap.cxx')

diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 1527896aee45..2d14d3f3e75f 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -21,6 +21,7 @@
 #include <ctype.h>
 #include <canvas/debug.hxx>
 #include <canvas/canvastools.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <vcl/bitmapex.hxx>
@@ -243,23 +244,20 @@ namespace dxcanvas
         return aRes;
     }
 
-#define IMPLEMENTATION_NAME "DXCanvas.CanvasBitmap"
-#define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap"
-
     OUString SAL_CALL CanvasBitmap::getImplementationName(  ) throw (uno::RuntimeException)
     {
-        return OUString( IMPLEMENTATION_NAME );
+        return OUString( "DXCanvas.CanvasBitmap" );
     }
 
     sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
     {
-        return ServiceName == SERVICE_NAME;
+        return cppu::supportsService( this, ServiceName );
     }
 
     uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  ) throw (uno::RuntimeException)
     {
         uno::Sequence< OUString > aRet(1);
-        aRet[0] = SERVICE_NAME;
+        aRet[0] = "com.sun.star.rendering.CanvasBitmap";
 
         return aRet;
     }
-- 
cgit v1.2.3