summaryrefslogtreecommitdiff
path: root/desktop/source/migration
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 /desktop/source/migration
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 'desktop/source/migration')
-rw-r--r--desktop/source/migration/services/basicmigration.cxx2
-rw-r--r--desktop/source/migration/services/basicmigration.hxx6
-rw-r--r--desktop/source/migration/services/cexports.cxx2
-rw-r--r--desktop/source/migration/services/cexportsoo3.cxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx6
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx2
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx6
8 files changed, 14 insertions, 14 deletions
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index dc0c47d0be05..1b407adba228 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -208,7 +208,7 @@ namespace migration
// component operations
- Reference< XInterface > SAL_CALL BasicMigration_create(
+ Reference< XInterface > BasicMigration_create(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new BasicMigration() );
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index d2d18463b297..8a0c45f664e1 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -37,9 +37,9 @@ namespace migration
{
- OUString SAL_CALL BasicMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL BasicMigration_create(
+ OUString BasicMigration_getImplementationName();
+ css::uno::Sequence< OUString > BasicMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > BasicMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index 9877705130c4..a56f0dae9458 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -50,7 +50,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * migrationoo2_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index eecb5ee929dc..a53884760d0b 100644
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -35,7 +35,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * migrationoo3_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index b8672ee44c7d..4510c93d2831 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -429,7 +429,7 @@ void TmpRepositoryCommandEnv::pop()
// component operations
-Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
+Reference< XInterface > OO3ExtensionMigration_create(
Reference< XComponentContext > const & ctx )
{
return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration(
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index c237f54020d3..62eb936dccdb 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -46,9 +46,9 @@ class INetURLObject;
namespace migration
{
- OUString SAL_CALL OO3ExtensionMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL OO3ExtensionMigration_create(
+ OUString OO3ExtensionMigration_getImplementationName();
+ css::uno::Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > OO3ExtensionMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 1830c65a362c..ab2264e4d683 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -242,7 +242,7 @@ bool IsUserWordbook( const OUString& rFile )
// component operations
- Reference< XInterface > SAL_CALL WordbookMigration_create(
+ Reference< XInterface > WordbookMigration_create(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new WordbookMigration() );
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 4fd535b1738b..81a60f7ee3c8 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -37,9 +37,9 @@ namespace migration
{
- OUString SAL_CALL WordbookMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL WordbookMigration_create(
+ OUString WordbookMigration_getImplementationName();
+ css::uno::Sequence< OUString > WordbookMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > WordbookMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );