mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#54938: Convert canvas to cppu::supportsService

Browse Source 
Final part

Change-Id: I5ff8e4aacf7be7c0cb1eab520f01cc312143641e
This commit is contained in:
Marcos Paulo de Souza 2014-01-14 13:05:02 -02:00 committed by Matúš Kukan
parent a2218b0d8b
commit ccf47bd943
15 changed files with 57 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
canvas/source/cairo/cairo_canvasbitmap.cxx
View File

@ -19,6 +19,7 @@
#include <canvas/debug.hxx>
#include <canvas/canvastools.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include "cairo_canvasbitmap.hxx"
@ -259,23 +260,20 @@ namespace cairocanvas
return aRV;
}
#define IMPLEMENTATION_NAME "CairoCanvas.CanvasBitmap"
#define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap"
OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException)
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "CairoCanvas.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;
}

10
canvas/source/cairo/cairo_canvascustomsprite.cxx
View File

@ -19,6 +19,7 @@
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
@ -138,23 +139,20 @@ namespace cairocanvas
return mpSpriteCanvas->getOutputDevice();
}
#define IMPLEMENTATION_NAME "CairoCanvas.CanvasCustomSprite"
#define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite"
OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "CairoCanvas.CanvasCustomSprite" );
}
sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.CanvasCustomSprite";
return aRet;
}

10
canvas/source/cairo/cairo_canvasfont.cxx
View File

@ -20,6 +20,7 @@
#include <canvas/debug.hxx>
#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/math.hxx>
#include <basegfx/numeric/ftools.hxx>
@ -138,23 +139,20 @@ namespace cairocanvas
return uno::Sequence< beans::PropertyValue >();
}
#define IMPLEMENTATION_NAME "CairoCanvas::CanvasFont"
#define SERVICE_NAME "com.sun.star.rendering.CanvasFont"
OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "CairoCanvas::CanvasFont" );
}
sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.CanvasFont";
return aRet;
}

10
canvas/source/cairo/cairo_textlayout.cxx
View File

@ -21,6 +21,7 @@
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/metric.hxx>
@ -631,23 +632,20 @@ namespace cairocanvas
OffsetTransformer( aMatrix ) );
}
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
#define IMPLEMENTATION_NAME "CairoCanvas::TextLayout"
OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "CairoCanvas::TextLayout" );
}
sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = OUString( SERVICE_NAME );
aRet[0] = "com.sun.star.rendering.TextLayout";
return aRet;
}

10
canvas/source/directx/dx_canvasbitmap.cxx
View File

@ -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;
}

10
canvas/source/directx/dx_canvascustomsprite.cxx
View File

@ -21,6 +21,7 @@
#include <ctype.h>
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
@ -82,23 +83,20 @@ namespace dxcanvas
CanvasCustomSpriteBaseT::disposeThis();
}
#define IMPLEMENTATION_NAME "DXCanvas.CanvasCustomSprite"
#define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite"
OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "DXCanvas.CanvasCustomSprite" );
}
sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.CanvasCustomSprite";
return aRet;
}

9
canvas/source/directx/dx_canvasfont.cxx
View File

@ -119,23 +119,20 @@ namespace dxcanvas
return rendering::FontMetrics();
}
#define SERVICE_NAME "com.sun.star.rendering.CanvasFont"
#define IMPLEMENTATION_NAME "DXCanvas::CanvasFont"
OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "DXCanvas::CanvasFont" );
}
sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.CanvasFont";
return aRet;
}

12
canvas/source/directx/dx_textlayout.cxx
View File

@ -21,6 +21,7 @@
#include <ctype.h>
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
@ -29,7 +30,6 @@
#include "dx_spritecanvas.hxx"
#include "dx_textlayout_drawhelper.hxx"
using namespace ::com::sun::star;
namespace dxcanvas
@ -246,24 +246,20 @@ namespace dxcanvas
return true;
}
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
#define IMPLEMENTATION_NAME "DXCanvas::TextLayout"
OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "DXCanvas::TextLayout" );
}
sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.TextLayout";
return aRet;
}

9
canvas/source/factory/cf_service.cxx
View File

@ -23,6 +23,7 @@
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@ -59,7 +60,6 @@ Sequence<OUString> SAL_CALL getSuppServices()
return Sequence<OUString>(&name, 1);
}
//==============================================================================
class CanvasFactory
: public ::cppu::WeakImplHelper3< lang::XServiceInfo,
lang::XMultiComponentFactory,
@ -226,20 +226,17 @@ Reference<XInterface> create( Reference<XComponentContext> const & xContext )
}
// XServiceInfo
//______________________________________________________________________________
OUString CanvasFactory::getImplementationName() throw (RuntimeException)
{
return getImplName();
}
//______________________________________________________________________________
sal_Bool CanvasFactory::supportsService( OUString const & serviceName )
throw (RuntimeException)
{
return serviceName.equals(getSuppServices()[0]);
return cppu::supportsService(this, serviceName);
}
//______________________________________________________________________________
Sequence<OUString> CanvasFactory::getSupportedServiceNames()
throw (RuntimeException)
{
@ -247,7 +244,6 @@ Sequence<OUString> CanvasFactory::getSupportedServiceNames()
}
// XMultiComponentFactory
//______________________________________________________________________________
Sequence<OUString> CanvasFactory::getAvailableServiceNames()
throw (RuntimeException)
{
@ -259,7 +255,6 @@ Sequence<OUString> CanvasFactory::getAvailableServiceNames()
return aServiceNames;
}
//______________________________________________________________________________
Reference<XInterface> CanvasFactory::createInstanceWithContext(
OUString const & name, Reference<XComponentContext> const & xContext )
throw (Exception)

10
canvas/source/tools/cachedprimitivebase.cxx
View File

@ -22,15 +22,13 @@
#include <canvas/base/cachedprimitivebase.hxx>
#include <com/sun/star/rendering/RepaintResult.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/tools/canvastools.hxx>
using namespace ::com::sun::star;
#define IMPLEMENTATION_NAME "canvas::CachedPrimitiveBase"
#define SERVICE_NAME "com.sun.star.rendering.CachedBitmap"
namespace canvas
{
CachedPrimitiveBase::CachedPrimitiveBase( const rendering::ViewState& rUsedViewState,
@ -83,18 +81,18 @@ namespace canvas
OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException)
{
return OUString( IMPLEMENTATION_NAME );
return OUString("canvas::CachedPrimitiveBase");
}
sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.CachedBitmap";
return aRet;
}

10
canvas/source/tools/parametricpolypolygon.cxx
View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <canvas/debug.hxx>
#include <canvas/canvastools.hxx>
@ -30,6 +29,7 @@
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/tools/tools.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <limits>
@ -199,23 +199,21 @@ namespace canvas
return mxDevice.is() ? mxDevice->getDeviceColorSpace() : uno::Reference< rendering::XColorSpace >();
}
#define IMPLEMENTATION_NAME "Canvas::ParametricPolyPolygon"
#define SERVICE_NAME "com.sun.star.rendering.ParametricPolyPolygon"
OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException)
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "Canvas::ParametricPolyPolygon" );
}
sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME;
aRet[0] = "com.sun.star.rendering.ParametricPolyPolygon";
return aRet;
}

10
canvas/source/vcl/canvasbitmap.cxx
View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <canvas/debug.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include "canvasbitmap.hxx"
@ -71,23 +71,21 @@ namespace vclcanvas
maCanvasHelper.init( rBitmap, rDevice, rOutDevProvider );
}
#define IMPLEMENTATION_NAME "VCLCanvas.CanvasBitmap"
#define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap"
OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException)
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "VCLCanvas.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] = OUString( SERVICE_NAME );
aRet[0] = "com.sun.star.rendering.CanvasBitmap";
return aRet;
}

10
canvas/source/vcl/canvascustomsprite.cxx
View File

@ -21,6 +21,7 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/math.hxx>
@ -117,23 +118,20 @@ namespace vclcanvas
maCanvasHelper.clear();
}
#define IMPLEMENTATION_NAME "VCLCanvas.CanvasCustomSprite"
#define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite"
OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "VCLCanvas.CanvasCustomSprite" );
}
sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = OUString( SERVICE_NAME );
aRet[0] = "com.sun.star.rendering.CanvasCustomSprite";
return aRet;
}

10
canvas/source/vcl/canvasfont.cxx
View File

@ -26,6 +26,7 @@
#include <vcl/metric.hxx>
#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <cppuhelper/supportsservice.hxx>
#include "canvasfont.hxx"
#include "textlayout.hxx"
@ -150,23 +151,20 @@ namespace vclcanvas
return uno::Sequence< beans::PropertyValue >();
}
#define IMPLEMENTATION_NAME "VCLCanvas::CanvasFont"
#define SERVICE_NAME "com.sun.star.rendering.CanvasFont"
OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "VCLCanvas::CanvasFont" );
}
sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = OUString( SERVICE_NAME );
aRet[0] = "com.sun.star.rendering.CanvasFont";
return aRet;
}

11
canvas/source/vcl/textlayout.cxx
View File

@ -24,6 +24,7 @@
#include <com/sun/star/rendering/CompositeOperation.hpp>
#include <com/sun/star/rendering/TextDirection.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/metric.hxx>
#include <vcl/virdev.hxx>
@ -461,24 +462,20 @@ namespace vclcanvas
OffsetTransformer( aMatrix ) );
}
#define IMPLEMENTATION_NAME "VCLCanvas::TextLayout"
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
{
return OUString( IMPLEMENTATION_NAME );
return OUString( "VCLCanvas::TextLayout" );
}
sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = OUString( SERVICE_NAME );
aRet[0] = "com.sun.star.rendering.TextLayout";
return aRet;
}