summaryrefslogtreecommitdiffstats
path: root/pyuno
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-08 15:58:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-11 12:13:46 +0100
commit3af500580b1c82eabd60335c9ebc458a3f68850c (patch)
treee0ad105be694cfb46221d16e9ce987879794fa04 /pyuno
parenttdf#114333: consider trleft for 1st cell width on import; don't... (diff)
downloadcore-3af500580b1c82eabd60335c9ebc458a3f68850c.tar.gz
core-3af500580b1c82eabd60335c9ebc458a3f68850c.zip
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for such functions, the annotation is redundant. Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d Reviewed-on: https://gerrit.libreoffice.org/46164 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/inc/pyuno.hxx4
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index 85c8ef9cdaff..e2d0c38de640 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -60,9 +60,9 @@
extern "C" LO_DLLPUBLIC_PYUNO
#if PY_MAJOR_VERSION >= 3
- PyObject* SAL_CALL PyInit_pyuno();
+ PyObject* PyInit_pyuno();
#else
- void SAL_CALL initpyuno();
+ void initpyuno();
#endif
namespace pyuno
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index adbf6c88e098..437bac4eb455 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -273,7 +273,7 @@ static const struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL pythonloader_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * pythonloader_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );