From 1afb790a118f07e888f7a1a94a8fd06d0d8713dd Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 12 Jun 2015 16:04:07 +0200 Subject: inline COMPHELPER_SERVICEDECL_ macro it was not adding any value Change-Id: I6a911aac81e883f9155ed0cf24bfb7904efb3f92 --- shell/source/sessioninstall/services.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx index 9372e63c79df..bc27deb7bf84 100644 --- a/shell/source/sessioninstall/services.cxx +++ b/shell/source/sessioninstall/services.cxx @@ -20,11 +20,17 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl( "org.libreoffice.comp.shell.sessioninstall.SyncDbusSessionHelper", "org.freedesktop.PackageKit.SyncDbusSessionHelper"); -COMPHELPER_SERVICEDECL_EXPORTS1(losessioninstall, SyncDbusSessionHelperServiceDecl); extern "C" +SAL_DLLPUBLIC_EXPORT void* SAL_CALL losessioninstall_component_getFactory( sal_Char const* pImplName, + void*, void* ) { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) - { return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); } + return component_getFactoryHelper( pImplName, SyncDbusSessionHelperServiceDecl ); +} + +extern "C" +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) +{ + return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); } -- cgit