From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: 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 Reviewed-by: Noel Grandin --- dbaccess/source/filter/xml/dbloader2.cxx | 4 ++-- dbaccess/source/filter/xml/xmlExport.cxx | 6 +++--- dbaccess/source/filter/xml/xmlfilter.cxx | 2 +- dbaccess/source/filter/xml/xmlservices.cxx | 4 ++-- dbaccess/source/filter/xml/xmlservices.hxx | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dbaccess/source/filter/xml') diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index e43e45c34919..d7c8f18af9f6 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -215,7 +215,7 @@ Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static() throw( } // namespace dbaxml -extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection() +extern "C" void createRegistryInfo_DBTypeDetection() { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection > aAutoRegistration; } @@ -571,7 +571,7 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, void*, void ) } -extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2() +extern "C" void createRegistryInfo_DBContentLoader2() { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBContentLoader > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index f0df68fe23f0..1dbd082cd983 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -85,18 +85,18 @@ namespace dbaxml }; } -extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( ) +extern "C" void createRegistryInfo_ODBFilterExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( ) +extern "C" void createRegistryInfo_OSettingsExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OFullExport( ) +extern "C" void createRegistryInfo_OFullExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFullExportHelper > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 64521cf1be35..f3980dcdb810 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star; -extern "C" void SAL_CALL createRegistryInfo_ODBFilter( ) +extern "C" void createRegistryInfo_ODBFilter( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 329c2fbb3d8b..7e5051234889 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -extern "C" void SAL_CALL createRegistryInfo_dbaxml() +extern "C" void createRegistryInfo_dbaxml() { static bool bInit = false; if (!bInit) @@ -41,7 +41,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbaxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx index 8176d8c0fb9b..66c8aa53cc74 100644 --- a/dbaccess/source/filter/xml/xmlservices.hxx +++ b/dbaccess/source/filter/xml/xmlservices.hxx @@ -26,12 +26,12 @@ extern "C" { -void SAL_CALL createRegistryInfo_DBContentLoader2(); -void SAL_CALL createRegistryInfo_DBTypeDetection(); -void SAL_CALL createRegistryInfo_ODBFilter(); -void SAL_CALL createRegistryInfo_ODBFilterExport(); -void SAL_CALL createRegistryInfo_OFullExport(); -void SAL_CALL createRegistryInfo_OSettingsExport(); +void createRegistryInfo_DBContentLoader2(); +void createRegistryInfo_DBTypeDetection(); +void createRegistryInfo_ODBFilter(); +void createRegistryInfo_ODBFilterExport(); +void createRegistryInfo_OFullExport(); +void createRegistryInfo_OSettingsExport(); } -- cgit