diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-15 10:21:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-15 14:46:51 +0100 |
| commit | c3250baa4a8029817f0d7fcaee8b9ffe169c6cb7 (patch) | |
| tree | cfdd547dfe4e3c9ae5bf22123a4f1d99ea84d94b /extensions/source | |
| parent | 65ee299a0c0e9044d809e58c3c5e75d05ad76f0e (diff) | |
loplugin:salcall (clang-cl)
Change-Id: Idda630320bb5e02e1ea675b3b3786c9ec6ac166b
Reviewed-on: https://gerrit.libreoffice.org/46504
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/ole/servprov.hxx | 8 | ||||
| -rw-r--r-- | extensions/source/ole/servreg.cxx | 10 | ||||
| -rw-r--r-- | extensions/source/update/check/onlinecheck.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/check/onlinecheck.hxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index 67dc9a71723d..b7f46f980fdf 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -34,13 +34,13 @@ using namespace std; namespace ole_adapter { /// @throws Exception -Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr); +Reference< XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr); /// @throws Exception -Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr); +Reference< XInterface> ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr); /// @throws Exception -Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr); +Reference<XInterface> OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr); /// @throws Exception -Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr); +Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr); /***************************************************************************** class declaration IClassFactoryWrapper diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 70dfe403338d..807bf990005b 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -29,32 +29,32 @@ using namespace cppu; namespace ole_adapter { -Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr) +Reference<XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr) { Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr); return xService; } -Reference<XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr) +Reference<XInterface> ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr) { Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr, UNO_OBJECT_WRAPPER_REMOTE_OPT, IUNKNOWN_WRAPPER_IMPL); return xService; } -Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr) +Reference<XInterface> OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr) { Reference<XInterface> xService = *new OleClient_Impl( xSMgr); return xService; } -Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr) +Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr) { Reference<XInterface > xService = *new OleServer_Impl(xSMgr); return xService; } } // end namespace -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * oleautobridge_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx index fd77299d11ef..4b8ac299c367 100644 --- a/extensions/source/update/check/onlinecheck.cxx +++ b/extensions/source/update/check/onlinecheck.cxx @@ -31,7 +31,7 @@ #include <wininet.h> // #i71984 -extern "C" bool SAL_CALL WNT_hasInternetConnection() +extern "C" bool WNT_hasInternetConnection() { DWORD dwFlags; WCHAR szConnectionName[1024]; diff --git a/extensions/source/update/check/onlinecheck.hxx b/extensions/source/update/check/onlinecheck.hxx index 731d3e6c2cbb..78d1bf4252d2 100644 --- a/extensions/source/update/check/onlinecheck.hxx +++ b/extensions/source/update/check/onlinecheck.hxx @@ -25,7 +25,7 @@ #include <sal/types.h> #if defined(_WIN32) -extern "C" bool SAL_CALL WNT_hasInternetConnection(); +extern "C" bool WNT_hasInternetConnection(); #endif #endif |