summaryrefslogtreecommitdiff
path: root/svtools/source
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 /svtools/source
parent0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff)
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 'svtools/source')
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx2
-rw-r--r--svtools/source/graphic/graphicunofactory.cxx2
-rw-r--r--svtools/source/graphic/provider.cxx2
-rw-r--r--svtools/source/graphic/renderer.cxx2
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.cxx2
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx2
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx6
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx2
-rw-r--r--svtools/source/uno/addrtempuno.cxx2
-rw-r--r--svtools/source/uno/fpicker.cxx4
-rw-r--r--svtools/source/uno/fpicker.hxx8
-rw-r--r--svtools/source/uno/miscservices.cxx2
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx2
14 files changed, 20 insertions, 20 deletions
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index a699ea6acc9a..163de06fb880 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -279,7 +279,7 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_svtools_SvFilterOptionsDialog_get_implementation(
css::uno::XComponentContext * context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index 391d743a05e4..18553092edf5 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -107,7 +107,7 @@ OUString SAL_CALL GObjectImpl::getUniqueID()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_graphic_GraphicObject_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 2e60b79b7ca2..accc367a0cf1 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -835,7 +835,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_graphic_GraphicProvider_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 047f91061388..0c67524789b1 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -296,7 +296,7 @@ void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphi
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_graphic_GraphicRendererVCL_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index cbe95f7bcdc6..f7b71d090c41 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -238,7 +238,7 @@ uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_embed_DocumentCloser_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index 9fc7a149afdd..d602b681d123 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -82,7 +82,7 @@ uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_embed_HatchWindowFactory_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 2441e29fc246..a20177785d66 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -202,7 +202,7 @@ namespace svt
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
- extern "C" { static void SAL_CALL thisModule() {} }
+ extern "C" { static void thisModule() {} }
#else
extern "C" void* getSvtAccessibilityComponentFactory();
#endif
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index de34418d37ce..8a633c49404c 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -162,7 +162,7 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
extern "C"
{
-static int SAL_CALL HTMLKeyCompare( const void *pFirst, const void *pSecond)
+static int HTMLKeyCompare( const void *pFirst, const void *pSecond)
{
HTML_TokenEntry const * pFirstEntry = static_cast<HTML_TokenEntry const *>(pFirst);
HTML_TokenEntry const * pSecondEntry = static_cast<HTML_TokenEntry const *>(pSecond);
@@ -499,7 +499,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = {
extern "C"
{
-static int SAL_CALL HTMLCharNameCompare( const void *pFirst, const void *pSecond)
+static int HTMLCharNameCompare( const void *pFirst, const void *pSecond)
{
HTML_CharEntry const * pFirstEntry = static_cast<HTML_CharEntry const *>(pFirst);
HTML_CharEntry const * pSecondEntry = static_cast<HTML_CharEntry const *>(pSecond);
@@ -908,7 +908,7 @@ static HTML_ColorEntry aHTMLColorNameTab[] = {
extern "C"
{
-static int SAL_CALL HTMLColorNameCompare( const void *pFirst, const void *pSecond)
+static int HTMLColorNameCompare( const void *pFirst, const void *pSecond)
{
HTML_ColorEntry const * pFirstEntry = static_cast<HTML_ColorEntry const *>(pFirst);
HTML_ColorEntry const * pSecondEntry = static_cast<HTML_ColorEntry const *>(pSecond);
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 8ce750686236..47e3e68e15d3 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1175,7 +1175,7 @@ static RTF_TokenEntry aRTFTokenTab[] = {
extern "C" {
-static int SAL_CALL RTFKeyCompare( const void *pFirst, const void *pSecond)
+static int RTFKeyCompare( const void *pFirst, const void *pSecond)
{
int nRet = 0;
if( -1 == static_cast<RTF_TokenEntry const *>(pFirst)->nToken )
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 37c6594564e4..88754128f81e 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -210,7 +210,7 @@ namespace {
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_svtools_OAddressBookSourceDialogUno_get_implementation(
css::uno::XComponentContext * context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index cab3e3a95db1..8db886d5cd1f 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -99,7 +99,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance (
return xResult;
}
-OUString SAL_CALL FilePicker_getImplementationName()
+OUString FilePicker_getImplementationName()
{
return OUString("com.sun.star.comp.svt.FilePicker");
}
@@ -168,7 +168,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance (
return xResult;
}
-OUString SAL_CALL FolderPicker_getImplementationName()
+OUString FolderPicker_getImplementationName()
{
return OUString("com.sun.star.comp.svt.FolderPicker");
}
diff --git a/svtools/source/uno/fpicker.hxx b/svtools/source/uno/fpicker.hxx
index 516c56ec667d..8e4056eb85ca 100644
--- a/svtools/source/uno/fpicker.hxx
+++ b/svtools/source/uno/fpicker.hxx
@@ -32,15 +32,15 @@ namespace com { namespace sun { namespace star {
namespace uno { class XInterface; }
} } }
-css::uno::Reference<css::uno::XInterface> SAL_CALL FilePicker_CreateInstance(
+css::uno::Reference<css::uno::XInterface> FilePicker_CreateInstance(
css::uno::Reference< css::uno::XComponentContext > const & context);
css::uno::Sequence<OUString> FilePicker_getSupportedServiceNames();
-OUString SAL_CALL FilePicker_getImplementationName();
+OUString FilePicker_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL FolderPicker_CreateInstance(
+css::uno::Reference<css::uno::XInterface> FolderPicker_CreateInstance(
css::uno::Reference< css::uno::XComponentContext > const & context);
css::uno::Sequence<OUString> FolderPicker_getSupportedServiceNames();
-OUString SAL_CALL FolderPicker_getImplementationName();
+OUString FolderPicker_getImplementationName();
#endif
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 5bc360795a61..89368f922543 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -56,7 +56,7 @@ namespace
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * svt_component_getFactory(
const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
{
void * pResult = nullptr;
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 447765bc0fdf..c44c8de02a8f 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -482,7 +482,7 @@ namespace {
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_svtools_uno_Wizard_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)