solenv/bin/native-code.py | 2 vcl/inc/factory.hxx | 16 ------- vcl/source/app/session.cxx | 23 +--------- vcl/source/components/factory.cxx | 14 ------ vcl/source/components/fontident.cxx | 28 ++++--------- vcl/vcl.android.component | 6 +- vcl/vcl.headless.component | 6 +- vcl/vcl.ios.component | 6 +- vcl/vcl.macosx.component | 6 +- vcl/vcl.unx.component | 6 +- vcl/vcl.windows.component | 6 +- xmlhelp/Library_ucpchelp1.mk | 1 xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 15 ------ xmlhelp/source/cxxhelp/provider/provider.cxx | 43 ++++---------------- xmlhelp/source/cxxhelp/provider/provider.hxx | 14 ------ xmlhelp/source/cxxhelp/provider/services.cxx | 58 --------------------------- xmlhelp/source/treeview/tvfactory.cxx | 37 ++--------------- xmlhelp/util/ucpchelp1.component | 8 ++- 18 files changed, 61 insertions(+), 234 deletions(-)
New commits: commit b719e02868d364849b26080fa4182d4adfc68250 Author: Noel Grandin <[email protected]> AuthorDate: Mon Jul 6 13:54:34 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jul 7 11:34:36 2020 +0200 xmlhelp: create instances with uno constructors See tdf#74608 for motivation Change-Id: Id05885b9da95009609cf8875be489aa88fd5a3cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98232 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 506ddad704d5..ac4b5e0f7196 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\ xmlhelp/source/cxxhelp/provider/resultsetbase \ xmlhelp/source/cxxhelp/provider/resultsetforquery \ xmlhelp/source/cxxhelp/provider/resultsetforroot \ - xmlhelp/source/cxxhelp/provider/services \ xmlhelp/source/cxxhelp/provider/urlparameter \ xmlhelp/source/treeview/tvfactory \ xmlhelp/source/treeview/tvread \ diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx index 992c9fc3747e..6ca53c7f52e4 100644 --- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx @@ -65,21 +65,6 @@ class TVFactory final : public cppu::WeakImplHelper < virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; - // Other - - static OUString getImplementationName_static(); - - static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - - static css::uno::Reference< css::lang::XSingleServiceFactory > - createServiceFactory( - const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); - - static css::uno::Reference< css::uno::XInterface > SAL_CALL - CreateInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory >& xMultiServiceFactory ); - - private: // Members diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index b82ba4917d24..6f690da96583 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -39,6 +39,7 @@ using namespace com::sun::star; using namespace chelp; + // ContentProvider Implementation. ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) @@ -102,11 +103,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes() // XServiceInfo methods. OUString SAL_CALL ContentProvider::getImplementationName() -{ - return getImplementationName_Static(); -} - -OUString ContentProvider::getImplementationName_Static() { return "CHelpContentProvider"; } @@ -120,35 +116,7 @@ ContentProvider::supportsService(const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames() { - return getSupportedServiceNames_Static(); -} - -/// @throws uno::Exception -static uno::Reference< uno::XInterface > -ContentProvider_CreateInstance( - const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) -{ - lang::XServiceInfo * pX = new ContentProvider( comphelper::getComponentContext(rSMgr) ); - return uno::Reference< uno::XInterface >::query( pX ); -} - -uno::Sequence< OUString > -ContentProvider::getSupportedServiceNames_Static() -{ - return { MYUCP_CONTENT_PROVIDER_SERVICE_NAME1, MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 }; -} - -// Service factory implementation. - -css::uno::Reference< css::lang::XSingleServiceFactory > -ContentProvider::createServiceFactory( const css::uno::Reference< - css::lang::XMultiServiceFactory >& rxServiceMgr ) -{ - return cppu::createOneInstanceFactory( - rxServiceMgr, - ContentProvider::getImplementationName_Static(), - ContentProvider_CreateInstance, - ContentProvider::getSupportedServiceNames_Static() ); + return { "com.sun.star.help.XMLHelp", "com.sun.star.ucb.HelpContentProvider" }; } // XContentProvider methods. @@ -268,4 +236,11 @@ void ContentProvider::subst( OUString& instpath ) instpath = aOptions.SubstituteVariable( instpath ); } +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +CHelpContentProvider_get_implementation( + css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) +{ + return cppu::acquire(new ContentProvider(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index c12d0cb7b995..0e752d34f56a 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -31,13 +31,6 @@ namespace chelp { -// UNO service name for the provider. This name will be used by the UCB to -// create instances of the provider. - -#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 "com.sun.star.help.XMLHelp" - -#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 "com.sun.star.ucb.HelpContentProvider" - // URL scheme. This is the scheme the provider will be able to create // contents for. The UCB will select the provider ( i.e. in order to create // contents ) according to this scheme. @@ -74,13 +67,6 @@ namespace chelp { virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - static OUString getImplementationName_Static(); - - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - - static css::uno::Reference< css::lang::XSingleServiceFactory > createServiceFactory( - const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); - // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx deleted file mode 100644 index f1541d5c4b87..000000000000 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ /dev/null @@ -1,58 +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 <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> - -#include "provider.hxx" -#include <tvfactory.hxx> - -using namespace com::sun::star; - -extern "C" SAL_DLLPUBLIC_EXPORT void * ucpchelp_component_getFactory( - const char * pImplName, - void * pServiceManager, - SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) -{ - void * pRet = nullptr; - - uno::Reference< lang::XMultiServiceFactory > xSMgr( - static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); - uno::Reference< lang::XSingleServiceFactory > xFactory; - - if ( ::chelp::ContentProvider::getImplementationName_Static(). - equalsAscii( pImplName ) ) - { - xFactory = ::chelp::ContentProvider::createServiceFactory( xSMgr ); - } - else if ( treeview::TVFactory::getImplementationName_static().equalsAscii( pImplName ) ) - { - xFactory = treeview::TVFactory::createServiceFactory( xSMgr ); - } - - if ( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - - return pRet; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 9f59b66e4025..fb879a5c3229 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -48,7 +48,7 @@ TVFactory::~TVFactory() OUString SAL_CALL TVFactory::getImplementationName() { - return TVFactory::getImplementationName_static(); + return "com.sun.star.help.TreeViewImpl"; } sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName ) @@ -59,7 +59,7 @@ sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames() { - return TVFactory::getSupportedServiceNames_static(); + return { "com.sun.star.help.TreeView", "com.sun.star.ucb.HiearchyDataSource" }; } // XMultiServiceFactory @@ -121,37 +121,12 @@ TVFactory::getAvailableServiceNames( ) return { "com.sun.star.ucb.HierarchyDataReadAccess" }; } -// static - -OUString -TVFactory::getImplementationName_static() -{ - return "com.sun.star.help.TreeViewImpl"; -} - -Sequence< OUString > -TVFactory::getSupportedServiceNames_static() +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +com_sun_star_help_TreeViewImpl_get_implementation( + css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { - return { "com.sun.star.help.TreeView", "com.sun.star.ucb.HiearchyDataSource" }; -} - -Reference< XSingleServiceFactory > -TVFactory::createServiceFactory( - const Reference< XMultiServiceFactory >& rxServiceMgr ) -{ - return cppu::createSingleFactory( - rxServiceMgr, - TVFactory::getImplementationName_static(), - TVFactory::CreateInstance, - TVFactory::getSupportedServiceNames_static() ); + return cppu::acquire(new TVFactory(context)); } -Reference< XInterface > SAL_CALL -TVFactory::CreateInstance( - const Reference< XMultiServiceFactory >& xMultiServiceFactory ) -{ - return static_cast<XServiceInfo*>( - new TVFactory(comphelper::getComponentContext(xMultiServiceFactory))); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component index 3df772cee1ae..dc1934ddfdcc 100644 --- a/xmlhelp/util/ucpchelp1.component +++ b/xmlhelp/util/ucpchelp1.component @@ -18,12 +18,14 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="ucpchelp" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="CHelpContentProvider"> + xmlns="http://openoffice.org/2010/uno-components";> + <implementation name="CHelpContentProvider" + constructor="CHelpContentProvider_get_implementation"> <service name="com.sun.star.help.XMLHelp"/> <service name="com.sun.star.ucb.HelpContentProvider"/> </implementation> - <implementation name="com.sun.star.help.TreeViewImpl"> + <implementation name="com.sun.star.help.TreeViewImpl" + constructor="com_sun_star_help_TreeViewImpl_get_implementation"> <service name="com.sun.star.help.TreeView"/> <service name="com.sun.star.ucb.HiearchyDataSource"/> </implementation> commit 439c9460408bb379cf2d37f3831461cf6879fb74 Author: Noel Grandin <[email protected]> AuthorDate: Mon Jul 6 14:10:29 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jul 7 11:34:25 2020 +0200 vcl: create instances with uno constructors See tdf#74608 for motivation Change-Id: I7f03e024eef5413d84d98f3fa9bd45ecaf413a72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98233 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index d6748918a7b2..43da9246a3c5 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -255,6 +255,8 @@ core_constructor_list = [ # vcl/vcl.android.component "com_sun_star_graphic_GraphicObject_get_implementation", "com_sun_star_comp_graphic_GraphicProvider_get_implementation", + "com_sun_star_frame_VCLSessionManagerClient_get_implementation", + "vcl_FontIdentificator_get_implementation", # svx/util/svx.component "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation", "com_sun_star_comp_svx_SmartTagMenuController_get_implementation", diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx index 54a382aa494c..f32fdaee6012 100644 --- a/vcl/inc/factory.hxx +++ b/vcl/inc/factory.hxx @@ -34,24 +34,8 @@ namespace com::sun::star { namespace uno { class XInterface; } } -css::uno::Sequence<OUString> vcl_session_getSupportedServiceNames(); - -OUString vcl_session_getImplementationName(); - -css::uno::Reference<css::uno::XInterface> vcl_session_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory > const &); - namespace vcl { -css::uno::Sequence<OUString> -FontIdentificator_getSupportedServiceNames(); - -OUString FontIdentificator_getImplementationName(); - -css::uno::Reference<css::uno::XInterface> -FontIdentificator_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory > const &); - OUString Clipboard_getImplementationName(); css::uno::Reference<css::lang::XSingleServiceFactory> diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 98cad6bba0b8..a289c601d551 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -389,26 +389,11 @@ void VCLSession::disposing() { // service implementation -OUString vcl_session_getImplementationName() +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +com_sun_star_frame_VCLSessionManagerClient_get_implementation( + css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&) { - SAL_INFO("vcl.se", "vcl_session_getImplementationName"); - - return "com.sun.star.frame.VCLSessionManagerClient"; -} - -Sequence< OUString > vcl_session_getSupportedServiceNames() -{ - SAL_INFO("vcl.se", "vcl_session_getSupportedServiceNames"); - - Sequence< OUString > aRet { "com.sun.star.frame.SessionManagerClient" }; - return aRet; -} - -css::uno::Reference< XInterface > vcl_session_createInstance( SAL_UNUSED_PARAMETER const css::uno::Reference< XMultiServiceFactory > & ) -{ - SAL_INFO("vcl.se", "vcl_session_createInstance"); - - return static_cast< cppu::OWeakObject * >(new VCLSession); + return cppu::acquire(static_cast< cppu::OWeakObject * >(new VCLSession)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index a82c71435453..6c1cfe2ec872 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -43,19 +43,7 @@ extern "C" { static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); Reference< css::lang::XSingleServiceFactory > xFactory; - if( vcl_session_getImplementationName().equalsAscii( pImplementationName ) ) - { - xFactory = ::cppu::createOneInstanceFactory( - xMgr, vcl_session_getImplementationName(), vcl_session_createInstance, - vcl_session_getSupportedServiceNames() ); - } - else if( vcl::FontIdentificator_getImplementationName().equalsAscii( pImplementationName ) ) - { - xFactory = ::cppu::createSingleFactory( - xMgr, vcl::FontIdentificator_getImplementationName(), vcl::FontIdentificator_createInstance, - vcl::FontIdentificator_getSupportedServiceNames() ); - } - else if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) ) + if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) ) { xFactory = vcl::Clipboard_createFactory(); } diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index b5ad54e5d612..fd4cbb2d2b59 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -50,7 +50,7 @@ class FontIdentificator : public ::cppu::WeakAggImplHelper3< XMaterialHolder, XI { Font m_aFont; public: -FontIdentificator() {} + FontIdentificator() {} // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; @@ -148,25 +148,10 @@ Any SAL_CALL FontIdentificator::getMaterial() return makeAny( aFD ); } -Sequence< OUString > FontIdentificator_getSupportedServiceNames() -{ - return Sequence< OUString >{ "com.sun.star.awt.FontIdentificator" }; -} - -OUString FontIdentificator_getImplementationName() -{ - return "vcl::FontIdentificator"; -} - -Reference< XInterface > FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& ) -{ - return static_cast< ::cppu::OWeakObject * >( new FontIdentificator ); -} - // XServiceInfo OUString SAL_CALL FontIdentificator::getImplementationName() { - return FontIdentificator_getImplementationName(); + return "vcl::FontIdentificator"; } sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) @@ -176,9 +161,16 @@ sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rService Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() { - return FontIdentificator_getSupportedServiceNames(); + return { "com.sun.star.awt.FontIdentificator" }; } } // namespace vcl +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +vcl_FontIdentificator_get_implementation( + css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&) +{ + return cppu::acquire(new vcl::FontIdentificator()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/vcl.android.component b/vcl/vcl.android.component index 2c4c4a5909bf..b81e61591471 100644 --- a/vcl/vcl.android.component +++ b/vcl/vcl.android.component @@ -22,10 +22,12 @@ <implementation name="com.sun.star.datatransfer.VCLGenericClipboard"> <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/> </implementation> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> </component> diff --git a/vcl/vcl.headless.component b/vcl/vcl.headless.component index f2adfaa457cd..6e8475f1969b 100644 --- a/vcl/vcl.headless.component +++ b/vcl/vcl.headless.component @@ -19,10 +19,12 @@ <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" prefix="vcl" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> </component> diff --git a/vcl/vcl.ios.component b/vcl/vcl.ios.component index 65f690d2f9e9..17e91391b855 100644 --- a/vcl/vcl.ios.component +++ b/vcl/vcl.ios.component @@ -22,10 +22,12 @@ <implementation name="com.sun.star.datatransfer.clipboard.iOSClipboard"> <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/> </implementation> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> </component> diff --git a/vcl/vcl.macosx.component b/vcl/vcl.macosx.component index 3373b85f9345..98339e3ce573 100644 --- a/vcl/vcl.macosx.component +++ b/vcl/vcl.macosx.component @@ -28,10 +28,12 @@ <implementation name="com.sun.star.datatransfer.clipboard.AquaClipboard"> <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/> </implementation> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> <implementation name="org.libreoffice.uitest.UITest" diff --git a/vcl/vcl.unx.component b/vcl/vcl.unx.component index 3e84d352c31c..70b3370c6ae3 100644 --- a/vcl/vcl.unx.component +++ b/vcl/vcl.unx.component @@ -28,10 +28,12 @@ <implementation name="com.sun.star.datatransfer.dnd.XdndSupport"> <service name="com.sun.star.datatransfer.dnd.X11DragSource"/> </implementation> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> <implementation name="org.libreoffice.uitest.UITest" diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component index 2d5b8bb51386..bc3bf755978c 100644 --- a/vcl/vcl.windows.component +++ b/vcl/vcl.windows.component @@ -19,10 +19,12 @@ <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" prefix="vcl" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.frame.VCLSessionManagerClient"> + <implementation name="com.sun.star.frame.VCLSessionManagerClient" + constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> - <implementation name="vcl::FontIdentificator"> + <implementation name="vcl::FontIdentificator" + constructor="vcl_FontIdentificator_get_implementation"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> <implementation name="org.libreoffice.uitest.UITest" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
