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

cairo/canvas: create instances with uno constructors

Browse Source 
See tdf#74608 for motivation

Change-Id: I02411b23136051bfd0cd02d5378297f99127017f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98189
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-07-06 09:48:01 +02:00
parent ba556833e1
commit 1cd0e02cdf
7 changed files with 28 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
canvas/Library_cairocanvas.mk
View File

@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_canvashelper \
canvas/source/cairo/cairo_canvashelper_text \
canvas/source/cairo/cairo_devicehelper \
canvas/source/cairo/cairo_services \
canvas/source/cairo/cairo_spritecanvas \
canvas/source/cairo/cairo_spritecanvashelper \
canvas/source/cairo/cairo_spritedevicehelper \

13
canvas/source/cairo/cairo_canvas.cxx
View File

@@ -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<css::uno::Any> const& args)
{
auto p = new cairocanvas::Canvas(args, context);
p->acquire();
p->initialize();
return static_cast<cppu::OWeakObject*>(p);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
canvas/source/cairo/cairo_canvas.hxx
View File

@@ -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,

74
canvas/source/cairo/cairo_services.cxx
View File

@@ -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 <sal/config.h>
#include <comphelper/servicedecl.hxx>
#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<uno::XInterface> initCanvas( Canvas* pCanvas )
{
uno::Reference<uno::XInterface> xRet(static_cast<cppu::OWeakObject*>(pCanvas));
pCanvas->initialize();
return xRet;
}
sdecl::class_< Canvas, sdecl::with_args<true> > const serviceImpl1(&initCanvas);
const sdecl::ServiceDecl cairoCanvasDecl(
serviceImpl1,
CANVAS_IMPLEMENTATION_NAME,
CANVAS_SERVICE_NAME );
static uno::Reference<uno::XInterface> initSpriteCanvas( SpriteCanvas* pCanvas )
{
uno::Reference<uno::XInterface> xRet(static_cast<cppu::OWeakObject*>(pCanvas));
pCanvas->initialize();
return xRet;
}
namespace sdecl = comphelper::service_decl;
sdecl::class_< SpriteCanvas, sdecl::with_args<true> > 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: */

12
canvas/source/cairo/cairo_spritecanvas.cxx
View File

@@ -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<css::uno::Any> const& args)
{
auto p = new cairocanvas::SpriteCanvas(args, context);
p->acquire();
p->initialize();
return static_cast<cppu::OWeakObject*>(p);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
canvas/source/cairo/cairo_spritecanvas.hxx
View File

@@ -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,

8
canvas/source/cairo/cairocanvas.component
View File

@@ -18,11 +18,13 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="cairocanvas" xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.Canvas.Cairo">
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.Canvas.Cairo"
constructor="com_sun_star_comp_rendering_Canvas_Cairo_get_implementation">
<service name="com.sun.star.rendering.Canvas.Cairo"/>
</implementation>
<implementation name="com.sun.star.comp.rendering.SpriteCanvas.Cairo">
<implementation name="com.sun.star.comp.rendering.SpriteCanvas.Cairo"
constructor="com_sun_star_comp_rendering_SpriteCanvas_Cairo_get_implementation">
<service name="com.sun.star.rendering.SpriteCanvas.Cairo"/>
</implementation>
</component>