summaryrefslogtreecommitdiff
path: root/testtools
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 /testtools
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 'testtools')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx4
-rw-r--r--testtools/source/bridgetest/constructors.cxx14
-rw-r--r--testtools/source/bridgetest/cppobj.cxx4
3 files changed, 11 insertions, 11 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 3209d774addd..a4244190f5ca 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1198,7 +1198,7 @@ Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
}
-static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
+static Reference< XInterface > TestBridgeImpl_create(
const Reference< XComponentContext > & xContext )
{
return Reference< XInterface >(
@@ -1210,7 +1210,7 @@ static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * )
{
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 790161bbc453..d1e9c6d5a0da 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -405,36 +405,36 @@ OUString Impl2::fn12( const OUString& arg )
return "12" + arg;
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL create(
+css::uno::Reference< css::uno::XInterface > create(
SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
const &)
{
return static_cast< ::cppu::OWeakObject * >(new Impl);
}
-OUString SAL_CALL getImplementationName() {
+OUString getImplementationName() {
return OUString(
"comp.test.testtools.bridgetest.Constructors");
}
-css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() {
+css::uno::Sequence< OUString > getSupportedServiceNames() {
css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors" };
return s;
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL create2(
+css::uno::Reference< css::uno::XInterface > create2(
SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
const &)
{
return static_cast< ::cppu::OWeakObject * >(new Impl2);
}
-OUString SAL_CALL getImplementationName2() {
+OUString getImplementationName2() {
return OUString(
"comp.test.testtools.bridgetest.Constructors2");
}
-css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() {
+css::uno::Sequence< OUString > getSupportedServiceNames2() {
css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors2" };
return s;
}
@@ -447,7 +447,7 @@ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() {
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 } };
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory(
char const * implName, void * serviceManager, void * registryKey)
{
return ::cppu::component_getFactoryHelper(
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index b4b648c3d350..6280a13f8158 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -1117,7 +1117,7 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames()
}
-static Reference< XInterface > SAL_CALL Test_Impl_create(
+static Reference< XInterface > Test_Impl_create(
SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
{
return Reference< XInterface >( static_cast<XBridgeTest *>(new Test_Impl()) );
@@ -1127,7 +1127,7 @@ static Reference< XInterface > SAL_CALL Test_Impl_create(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * component_getFactory(
const sal_Char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager,
SAL_UNUSED_PARAMETER void * )
{