From 1cd0e02cdf7fc5b5903320ffd24865d11465d14b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 6 Jul 2020 09:48:01 +0200 Subject: cairo/canvas: create instances with uno constructors See tdf#74608 for motivation Change-Id: I02411b23136051bfd0cd02d5378297f99127017f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98189 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/source/cairo/cairo_canvas.cxx | 13 +++++- canvas/source/cairo/cairo_canvas.hxx | 3 -- canvas/source/cairo/cairo_services.cxx | 74 ------------------------------ canvas/source/cairo/cairo_spritecanvas.cxx | 12 ++++- canvas/source/cairo/cairo_spritecanvas.hxx | 3 -- canvas/source/cairo/cairocanvas.component | 8 ++-- 6 files changed, 28 insertions(+), 85 deletions(-) delete mode 100644 canvas/source/cairo/cairo_services.cxx (limited to 'canvas/source') diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 3f6dcaf3d2f9..0b7790e7b94b 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -113,7 +113,7 @@ namespace cairocanvas OUString SAL_CALL Canvas::getServiceName( ) { - return CANVAS_SERVICE_NAME; + return "com.sun.star.rendering.Canvas.Cairo"; } bool Canvas::repaint( const SurfaceSharedPtr& pSurface, @@ -159,4 +159,15 @@ namespace cairocanvas } } +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +com_sun_star_comp_rendering_Canvas_Cairo_get_implementation( + css::uno::XComponentContext* context, css::uno::Sequence const& args) +{ + auto p = new cairocanvas::Canvas(args, context); + p->acquire(); + p->initialize(); + return static_cast(p); +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 581f23dac2b9..9c672d453fde 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -40,9 +40,6 @@ #include "cairo_repainttarget.hxx" #include "cairo_surfaceprovider.hxx" -#define CANVAS_SERVICE_NAME "com.sun.star.rendering.Canvas.Cairo" -#define CANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.Canvas.Cairo" - namespace cairocanvas { typedef ::cppu::WeakComponentImplHelper< css::rendering::XBitmapCanvas, diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx deleted file mode 100644 index c90ed7cfc7df..000000000000 --- a/canvas/source/cairo/cairo_services.cxx +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -#include - -#include "cairo_canvas.hxx" -#include "cairo_spritecanvas.hxx" - - -using namespace ::com::sun::star; - -#if defined(_WIN32) || defined (MACOSX) -# error "The cairo canvas should not be enabled on Windows or Mac cf fdo#46901" -#endif - -namespace sdecl = comphelper::service_decl; - -namespace cairocanvas -{ - static uno::Reference initCanvas( Canvas* pCanvas ) - { - uno::Reference xRet(static_cast(pCanvas)); - pCanvas->initialize(); - return xRet; - } - - sdecl::class_< Canvas, sdecl::with_args > const serviceImpl1(&initCanvas); - const sdecl::ServiceDecl cairoCanvasDecl( - serviceImpl1, - CANVAS_IMPLEMENTATION_NAME, - CANVAS_SERVICE_NAME ); - - static uno::Reference initSpriteCanvas( SpriteCanvas* pCanvas ) - { - uno::Reference xRet(static_cast(pCanvas)); - pCanvas->initialize(); - return xRet; - } - - namespace sdecl = comphelper::service_decl; - sdecl::class_< SpriteCanvas, sdecl::with_args > const serviceImpl2(&initSpriteCanvas); - const sdecl::ServiceDecl cairoSpriteCanvasDecl( - serviceImpl2, - SPRITECANVAS_IMPLEMENTATION_NAME, - SPRITECANVAS_SERVICE_NAME ); -} - -// The C shared lib entry points -extern "C" -SAL_DLLPUBLIC_EXPORT void* cairocanvas_component_getFactory( char const* pImplName, - void*, void* ) -{ - return sdecl::component_getFactoryHelper( pImplName, {&cairocanvas::cairoCanvasDecl, &cairocanvas::cairoSpriteCanvasDecl} ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index d2e983ca2ade..1f446642cc11 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -132,7 +132,7 @@ namespace cairocanvas OUString SAL_CALL SpriteCanvas::getServiceName( ) { - return SPRITECANVAS_SERVICE_NAME; + return "com.sun.star.rendering.SpriteCanvas.Cairo"; } SurfaceSharedPtr SpriteCanvas::getSurface() @@ -204,4 +204,14 @@ namespace cairocanvas } } +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +com_sun_star_comp_rendering_SpriteCanvas_Cairo_get_implementation( + css::uno::XComponentContext* context, css::uno::Sequence const& args) +{ + auto p = new cairocanvas::SpriteCanvas(args, context); + p->acquire(); + p->initialize(); + return static_cast(p); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 42765643fabe..fde88d040389 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -43,9 +43,6 @@ #include "cairo_surfaceprovider.hxx" #include "cairo_spritecanvashelper.hxx" -#define SPRITECANVAS_SERVICE_NAME "com.sun.star.rendering.SpriteCanvas.Cairo" -#define SPRITECANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.SpriteCanvas.Cairo" - namespace cairocanvas { typedef ::cppu::WeakComponentImplHelper< css::rendering::XSpriteCanvas, diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component index 9f68ee4752de..7a201f582ef4 100644 --- a/canvas/source/cairo/cairocanvas.component +++ b/canvas/source/cairo/cairocanvas.component @@ -18,11 +18,13 @@ --> - + xmlns="http://openoffice.org/2010/uno-components"> + - + -- cgit