desktop/test/deployment/active/active_native.cxx | 6 +++--- desktop/test/deployment/passive/passive_native.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 3c9c9c54e1c428007088533ad831f9b3c02e3ddc Author: Stephan Bergmann <[email protected]> Date: Tue Feb 13 14:41:47 2018 +0100 loplugin:salcall (Extension_test-{active,passive}) Change-Id: I4cb850a4ceb44dfe2807afe38f3fa131e6590932 diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 0c1154bcc441..cf8226ab34bd 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -234,21 +234,21 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool component_writeInfo( void * pServiceManager, void * pRegistryKey) { if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) { diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 272d5cfbad6f..aadd8793ab90 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -231,14 +231,14 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
