From 29c5e1ccbe28751297699eb184a861ee6b2f2f7e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sun, 5 Jul 2020 15:37:54 +0200
Subject: cui,cppcanvas: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: Id603bc26f95d3da86b8c7360a7bde8eee97049ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98141
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 cppcanvas/source/uno/mtfrenderer.component |  5 ++--
 cppcanvas/source/uno/uno_mtfrenderer.cxx   | 48 ++++++++++++++++++++++--------
 cppcanvas/source/uno/uno_mtfrenderer.hxx   | 44 ---------------------------
 3 files changed, 39 insertions(+), 58 deletions(-)
 delete mode 100644 cppcanvas/source/uno/uno_mtfrenderer.hxx

(limited to 'cppcanvas')

diff --git a/cppcanvas/source/uno/mtfrenderer.component b/cppcanvas/source/uno/mtfrenderer.component
index cac7384e9bee..36020729fd30 100644
--- a/cppcanvas/source/uno/mtfrenderer.component
+++ b/cppcanvas/source/uno/mtfrenderer.component
@@ -8,8 +8,9 @@
  *
 -->
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="mtfrenderer" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.rendering.MtfRenderer">
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.rendering.MtfRenderer"
+    constructor="com_sun_star_comp_rendering_MtfRenderer_get_implementation">
     <service name="com.sun.star.rendering.MtfRenderer"/>
   </implementation>
 </component>
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 25540e2a54c1..76037892b4d0 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -7,13 +7,42 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "uno_mtfrenderer.hxx"
 #include <cppcanvas/vclfactory.hxx>
-#include <comphelper/servicedecl.hxx>
 #include <o3tl/any.hxx>
+#include <com/sun/star/rendering/XMtfRenderer.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <vcl/gdimtf.hxx>
 
 using namespace ::com::sun::star;
 
+typedef cppu::WeakComponentImplHelper<css::rendering::XMtfRenderer, css::beans::XFastPropertySet> MtfRendererBase;
+
+namespace {
+
+class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase
+{
+public:
+    MtfRenderer (css::uno::Sequence<css::uno::Any> const& args,
+                 css::uno::Reference<css::uno::XComponentContext> const&);
+
+    // XMtfRenderer iface
+    void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) override;
+    void SAL_CALL draw (double fScaleX, double fScaleY) override;
+
+    // XFastPropertySet
+    // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
+    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) override { return css::uno::Any(); }
+    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) override;
+
+private:
+    GDIMetaFile* mpMetafile;
+    css::uno::Reference<css::rendering::XBitmapCanvas> mxCanvas;
+};
+
 void MtfRenderer::setMetafile (const uno::Sequence< sal_Int8 >& /*rMtf*/)
 {
         // printf ("MtfRenderer::setMetafile unimplemented, use fast property set or implement me\n");
@@ -45,18 +74,13 @@ MtfRenderer::MtfRenderer (uno::Sequence<uno::Any> const& aArgs, uno::Reference<u
     }
 }
 
-namespace sdecl = comphelper::service_decl;
- const sdecl::ServiceDecl MtfRendererDecl(
-     sdecl::class_<MtfRenderer, sdecl::with_args<true> >(),
-    "com.sun.star.comp.rendering.MtfRenderer",
-    "com.sun.star.rendering.MtfRenderer" );
+} // namespace
 
-// The C shared lib entry points
-extern "C"
-SAL_DLLPUBLIC_EXPORT void* mtfrenderer_component_getFactory( char const* pImplName,
-                                         void*, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_rendering_MtfRenderer_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
 {
-    return sdecl::component_getFactoryHelper( pImplName, {&MtfRendererDecl} );
+    return cppu::acquire(new MtfRenderer(args, context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
deleted file mode 100644
index 6cb720a31d00..000000000000
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ /dev/null
@@ -1,44 +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/.
- */
-
-#ifndef INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
-#define INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
-#include <com/sun/star/rendering/XMtfRenderer.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <vcl/gdimtf.hxx>
-
-typedef cppu::WeakComponentImplHelper<css::rendering::XMtfRenderer, css::beans::XFastPropertySet> MtfRendererBase;
-
-class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase
-{
-public:
-    MtfRenderer (css::uno::Sequence<css::uno::Any> const& args,
-                 css::uno::Reference<css::uno::XComponentContext> const&);
-
-    // XMtfRenderer iface
-    void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) override;
-    void SAL_CALL draw (double fScaleX, double fScaleY) override;
-
-    // XFastPropertySet
-    // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
-    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) override { return css::uno::Any(); }
-    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) override;
-
-private:
-    GDIMetaFile* mpMetafile;
-    css::uno::Reference<css::rendering::XBitmapCanvas> mxCanvas;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit