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>

40 files changed, 74 insertions, 74 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index db702ab5b268..4ac176e343e4 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -94,7 +94,7 @@ using namespace ::com::sun::star::util;
 using namespace ::cppu;
 using namespace ::osl;
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* context,
                                                  css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index dc76bfa4b39b..f3ed8e73e388 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -267,7 +267,7 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
 
 }   // namespace dbaccess
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dba_OComponentDefinition(css::uno::XComponentContext* context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 6f78cfd4fe64..44d2011a83e2 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -122,7 +122,7 @@ void SAL_CALL OCommandDefinition::rename( const OUString& newName )
 
 }   // namespace dbaccess
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dba_OCommandDefinition(css::uno::XComponentContext* context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index f148e24c3ea0..9c652ceec9d1 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -253,7 +253,7 @@ struct Singleton:
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_dba_DataAccessDescriptorFactory(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index aa0c22f1d87c..e5c34a8f53e7 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2175,7 +2175,7 @@ OUString SAL_CALL ODatabaseDocument::getUntitledPrefix()
 
 }   // namespace dbaccess
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 258a93ae1548..059a8f67a410 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1311,7 +1311,7 @@ Reference< XInterface > ODatabaseSource::getThis() const
 
 }   // namespace dbaccess
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dba_ODatabaseSource(css::uno::XComponentContext* context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 6ba082d811a0..e1b3b5bef241 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -48,7 +48,7 @@ namespace dba{
     };
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dba_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* pRegistryKey)
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 1ced4c105042..2482e70722ce 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -20,7 +20,7 @@
 #include <cppuhelper/factory.hxx>
 #include "macromigrationwizard.hxx"
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbmm_component_getFactory(
     const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
     SAL_UNUSED_PARAMETER void* )
 {
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();
 
 }
 
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index fea7e3c21174..3cb4ce5b1521 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -21,7 +21,7 @@
 #error "don't include this file directly! use dbu_reghelper.hxx instead!"
 #endif
 
-typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation)
+typedef css::uno::Reference< css::lang::XSingleServiceFactory > (*FactoryInstantiation)
         (
             const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager,
             const OUString & _rComponentName,
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 1e594ed958dd..40943501bf4d 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -23,7 +23,7 @@
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* sdbt_component_getFactory(
                     const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*)
 {
     Reference< XInterface > xRet;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 951664a736d6..e181050ece55 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -125,7 +125,7 @@
 
 #include <functional>
 
-extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
+extern "C" void createRegistryInfo_ODBApplication()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index e390af10f487..e4ce425cc3d0 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -101,7 +101,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContex
 
 }
 
-extern "C" void SAL_CALL createRegistryInfo_DBContentLoader()
+extern "C" void createRegistryInfo_DBContentLoader()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 93ce18f1972c..2064f344e5cf 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::frame;
 using namespace dbaui;
 
 // SbaExternalSourceBrowser
-extern "C" void SAL_CALL createRegistryInfo_OFormGridView()
+extern "C" void createRegistryInfo_OFormGridView()
 {
     static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 31939a46c5d1..2b534bc1cafa 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -105,7 +105,7 @@ using namespace ::dbtools;
 using namespace ::svx;
 using namespace ::svt;
 
-extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl()
+extern "C" void createRegistryInfo_SbaXGridControl()
 {
     static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index bae1e73070c5..a82590aeefe6 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -155,7 +155,7 @@ using namespace ::comphelper;
 using namespace ::svx;
 
 // SbaTableQueryBrowser
-extern "C" void SAL_CALL createRegistryInfo_OBrowser()
+extern "C" void createRegistryInfo_OBrowser()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SbaTableQueryBrowser > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx
index 4a2f7d1b062a..3bc1d53bf218 100644
--- a/dbaccess/source/ui/inc/uiservices.hxx
+++ b/dbaccess/source/ui/inc/uiservices.hxx
@@ -26,30 +26,30 @@
 
 extern "C" {
 
-void SAL_CALL createRegistryInfo_ComposerDialogs();
-void SAL_CALL createRegistryInfo_CopyTableWizard();
-void SAL_CALL createRegistryInfo_DBContentLoader();
-void SAL_CALL createRegistryInfo_LimitBoxController();
-void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog();
-void SAL_CALL createRegistryInfo_OBrowser();
-void SAL_CALL createRegistryInfo_OColumnControl();
-void SAL_CALL createRegistryInfo_OColumnControlModel();
-void SAL_CALL createRegistryInfo_ODBApplication();
-void SAL_CALL createRegistryInfo_ODBTypeWizDialog();
-void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup();
-void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog();
-void SAL_CALL createRegistryInfo_ODirectSQLDialog();
-void SAL_CALL createRegistryInfo_OFormGridView();
-void SAL_CALL createRegistryInfo_OInteractionHandler();
-void SAL_CALL createRegistryInfo_OQueryControl();
-void SAL_CALL createRegistryInfo_ORelationControl();
-void SAL_CALL createRegistryInfo_OSQLMessageDialog();
-void SAL_CALL createRegistryInfo_OTableControl();
-void SAL_CALL createRegistryInfo_OTableFilterDialog();
-void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog();
-void SAL_CALL createRegistryInfo_OUserSettingsDialog();
-void SAL_CALL createRegistryInfo_OViewControl();
-void SAL_CALL createRegistryInfo_SbaXGridControl();
+void createRegistryInfo_ComposerDialogs();
+void createRegistryInfo_CopyTableWizard();
+void createRegistryInfo_DBContentLoader();
+void createRegistryInfo_LimitBoxController();
+void createRegistryInfo_OAdvancedSettingsDialog();
+void createRegistryInfo_OBrowser();
+void createRegistryInfo_OColumnControl();
+void createRegistryInfo_OColumnControlModel();
+void createRegistryInfo_ODBApplication();
+void createRegistryInfo_ODBTypeWizDialog();
+void createRegistryInfo_ODBTypeWizDialogSetup();
+void createRegistryInfo_ODataSourcePropertyDialog();
+void createRegistryInfo_ODirectSQLDialog();
+void createRegistryInfo_OFormGridView();
+void createRegistryInfo_OInteractionHandler();
+void createRegistryInfo_OQueryControl();
+void createRegistryInfo_ORelationControl();
+void createRegistryInfo_OSQLMessageDialog();
+void createRegistryInfo_OTableControl();
+void createRegistryInfo_OTableFilterDialog();
+void createRegistryInfo_OTextConnectionSettingsDialog();
+void createRegistryInfo_OUserSettingsDialog();
+void createRegistryInfo_OViewControl();
+void createRegistryInfo_SbaXGridControl();
 
 }
 
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index aabb6cfd9e6c..26eec900d1fd 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.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_DBU()
+extern "C" void createRegistryInfo_DBU()
 {
     static bool bInit = false;
     if (!bInit)
@@ -59,7 +59,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
     }
 }
 
-extern "C"  SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory(
+extern "C"  SAL_DLLPUBLIC_EXPORT void* dbu_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 51c2d2912b91..d2bfb7348d50 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -218,7 +218,7 @@ void LimitBoxController::dispatchCommand(
 
 } ///dbaui namespace
 
-extern "C" void SAL_CALL createRegistryInfo_LimitBoxController()
+extern "C" void createRegistryInfo_LimitBoxController()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LimitBoxController > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index ea6e5777297f..4a4dc1f41436 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -85,7 +85,7 @@
 #include <memory>
 #include <vector>
 
-extern "C" void SAL_CALL createRegistryInfo_OQueryControl()
+extern "C" void createRegistryInfo_OQueryControl()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OQueryController > aAutoRegistration;
 }
@@ -131,7 +131,7 @@ namespace dbaui
     };
 }
 
-extern "C" void SAL_CALL createRegistryInfo_OViewControl()
+extern "C" void createRegistryInfo_OViewControl()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OViewController > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 5bddac211f29..233ee361c776 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -72,7 +72,7 @@
 
 #define MAX_THREADS 10
 
-extern "C" void SAL_CALL createRegistryInfo_ORelationControl()
+extern "C" void createRegistryInfo_ORelationControl()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ORelationController > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index a1a2ff009904..772bcb8bc27a 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -69,7 +69,7 @@
 #include <algorithm>
 #include <functional>
 
-extern "C" void SAL_CALL createRegistryInfo_OTableControl()
+extern "C" void createRegistryInfo_OTableControl()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTableController > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 935f6f6e0119..f82b414af681 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -127,7 +127,7 @@ namespace dbaui
 
 }   // namespace dbaui
 
-extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog()
+extern "C" void createRegistryInfo_OAdvancedSettingsDialog()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OAdvancedSettingsDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index e8006243ee64..720f0e40075c 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -26,7 +26,7 @@
 #include <dbu_reghelper.hxx>
 #include <comphelper/processfactory.hxx>
 
-extern "C" void SAL_CALL createRegistryInfo_OColumnControl()
+extern "C" void createRegistryInfo_OColumnControl()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControl> aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index cd249c4e1f01..389bf3e1e6da 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -30,7 +30,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/property.hxx>
 
-extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel()
+extern "C" void createRegistryInfo_OColumnControlModel()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControlModel> aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 6196d45154d9..355708d80624 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -25,7 +25,7 @@
 
 using namespace dbaui;
 
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog()
+extern "C" void createRegistryInfo_ODBTypeWizDialog()
 {
     static OMultiInstanceAutoRegistration< ODBTypeWizDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 33d58789da88..d13cb0827cf7 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -30,7 +30,7 @@
 
 using namespace dbaui;
 
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup()
+extern "C" void createRegistryInfo_ODBTypeWizDialogSetup()
 {
     static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 876f5106228d..c5420fa10a49 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -25,7 +25,7 @@
 
 using namespace dbaui;
 
-extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog()
+extern "C" void createRegistryInfo_OTableFilterDialog()
 {
     static OMultiInstanceAutoRegistration< OTableFilterDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index ffd199a77a1a..e340956961bb 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -25,7 +25,7 @@
 
 using namespace dbaui;
 
-extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog()
+extern "C" void createRegistryInfo_OUserSettingsDialog()
 {
     static OMultiInstanceAutoRegistration< OUserSettingsDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index b126b2942332..530cd12f7b81 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -25,7 +25,7 @@
 
 using namespace dbaui;
 
-extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog()
+extern "C" void createRegistryInfo_ODataSourcePropertyDialog()
 {
     static OMultiInstanceAutoRegistration< ODataSourcePropertyDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index f6f059220613..5b2aa150563b 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -30,7 +30,7 @@
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 
-extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs()
+extern "C" void createRegistryInfo_ComposerDialogs()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetOrderDialog > aOrderDialogRegistration;
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetFilterDialog > aFilterDialogRegistration;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index a1b141a919ba..43abd33ce95b 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1549,7 +1549,7 @@ void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult )
 
 } // namespace dbaui
 
-extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard()
+extern "C" void createRegistryInfo_CopyTableWizard()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::CopyTableWizard > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 639966a713a3..b6371ad59eb8 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -40,7 +40,7 @@
 #include <UITools.hxx>
 #include <comphelper/processfactory.hxx>
 
-extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler()
+extern "C" void createRegistryInfo_OInteractionHandler()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SQLExceptionInteractionHandler > aSQLExceptionInteractionHandler_AutoRegistration;
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LegacyInteractionHandler > aLegacyInteractionHandler_AutoRegistration;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 849c66ae9a37..4c4034334b0f 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -255,7 +255,7 @@ namespace dbaui
 
 } // namespace dbaui
 
-extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog()
+extern "C" void createRegistryInfo_OTextConnectionSettingsDialog()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTextConnectionSettingsDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 003a8eece5bb..5f7163dc7d88 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -32,7 +32,7 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 
-extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog()
+extern "C" void createRegistryInfo_ODirectSQLDialog()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ODirectSQLDialog > aAutoRegistration;
 }
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 1f20c8baabe3..8b01455fdd11 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -34,7 +34,7 @@ using namespace dbtools;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 
-extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog()
+extern "C" void createRegistryInfo_OSQLMessageDialog()
 {
     static OMultiInstanceAutoRegistration< OSQLMessageDialog > aAutoRegistration;
 }