No need to keep these whitelisted functions decorated with SAL_CALL

The only effect SAL_CALL effectively has on LO-internal code is to change non-
static member functions from __thiscall to __cdecl in MSVC (where all other
functions are __cdecl by default, anyway).  (For 3rd-party code, it could be
argued that SAL_CALL is useful on function declarations in the URE stable
interface other than non-static member functions, too, in case 3rd-party code
uses a compiler switch to change the default calling convention to something
other than __cdecl.  But loplugin:salcall exempts the URE stable interface,
anyway.)

One could argue that SAL_CALL, even if today it effectively only affects non-
static member functions in MSVC, could be extended in the future to affect more
functions on more platforms.  However, the current code would already not
support that.  For example, 3af500580b1c82eabd60335c9ebc458a3f68850c
"loplugin:salcall fix functions" changed FrameControl_createInstance in
UnoControls/source/base/registercontrols.cxx to no longer be SAL_CALL, even
though its address (in ctl_component_getFacrory, in the same file) is passed to
cppuhelper::createSingleFactory as an argument of type
cppu::ComponentInstantiation, which is a pointer to SAL_CALL function.

Change-Id: I3acbf7314a3d7868ed70e35bb5c47bc11a0b7ff6
Reviewed-on: https://gerrit.libreoffice.org/46436
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

52 files changed, 108 insertions, 108 deletions

diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index 70218008bb72..21616edaa3da 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -62,7 +62,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(css::uno::Reference< css::uno::XComponentContext > const & context);
+        Create(css::uno::Reference< css::uno::XComponentContext > const & context);
 
 private:
     // css::uno::XInterface:
diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx
index 3aac43f4ca9c..c69c35084e47 100644
--- a/dbaccess/source/core/inc/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -131,7 +131,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_static();
     static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
+        Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
     // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType(  ) override;
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 4cb72dce82df..fccd12968016 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -40,7 +40,7 @@ namespace dbmm
         }
     }
 
-    Reference< XInterface > SAL_CALL MacroMigrationDialogService::Create( const Reference< XComponentContext >& _rxContext )
+    Reference< XInterface > MacroMigrationDialogService::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *(new MacroMigrationDialogService( _rxContext ) );
     }
@@ -55,12 +55,12 @@ namespace dbmm
         return css::uno::Sequence<sal_Int8>();
     }
 
-    OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static()
+    OUString MacroMigrationDialogService::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" );
     }
 
-    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static()
+    Sequence< OUString > MacroMigrationDialogService::getSupportedServiceNames_static()
     {
         Sequence< OUString > aServices { "com.sun.star.sdb.application.MacroMigrationWizard" };
         return aServices;
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
index 2da76f44f0e9..886239cde4de 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
@@ -77,11 +77,11 @@ namespace dbmm
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // helper for factories
-        static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
+        static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext );
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_static();
+        static OUString getImplementationName_static();
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
+        static Sequence< OUString > getSupportedServiceNames_static();
 
     protected:
         virtual ~MacroMigrationDialogService() override;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index d7c8f18af9f6..6de682c0ff6a 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -112,7 +112,7 @@ public:
     }
     static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 };
@@ -183,7 +183,7 @@ OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::Prope
     return OUString();
 }
 
-Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMultiServiceFactory >  & rSMgr )
+Reference< XInterface > DBTypeDetection::Create( const Reference< XMultiServiceFactory >  & rSMgr )
 {
     return *(new DBTypeDetection( comphelper::getComponentContext(rSMgr) ));
 }
@@ -247,7 +247,7 @@ public:
     }
     static Sequence< OUString > getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
@@ -267,7 +267,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactor
 
 }
 
-Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory >  & rSMgr )
+Reference< XInterface > DBContentLoader::Create( const Reference< XMultiServiceFactory >  & rSMgr )
 {
     return *(new DBContentLoader( comphelper::getComponentContext(rSMgr) ));
 }
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 1dbd082cd983..5c7bfb047e67 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -69,19 +69,19 @@ namespace dbaxml
     {
     public:
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
-        static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
+        static Sequence< OUString > getSupportedServiceNames_Static(  );
+        static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
     class ODBFullExportHelper
     {
     public:
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
-        static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
+        static Sequence< OUString > getSupportedServiceNames_Static(  );
+        static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
 }
 
@@ -103,31 +103,31 @@ extern "C" void createRegistryInfo_OFullExport( )
 
 namespace dbaxml
 {
-    Reference< XInterface > SAL_CALL ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
+    Reference< XInterface > ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY ));
     }
 
-    OUString SAL_CALL ODBExportHelper::getImplementationName_Static(  )
+    OUString ODBExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
     }
 
-    Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static(  )
+    Sequence< OUString > ODBExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
     }
 
-    Reference< XInterface > SAL_CALL ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
+    Reference< XInterface > ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::ALL));
     }
-    OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static(  )
+    OUString ODBFullExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.sdb.XMLFullExporter");
     }
-    Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static(  )
+    Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -260,7 +260,7 @@ css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
 }
 
 css::uno::Reference< css::uno::XInterface >
-    SAL_CALL ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+    ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
 {
     return static_cast< XServiceInfo* >(new ODBExport( comphelper::getComponentContext(_rxORB), getImplementationName_Static()));
 }
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 441974d8736c..1f357c201e14 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -172,13 +172,13 @@ public:
     ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
 
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static();
+    static OUString getImplementationName_Static();
 
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence<OUString> SAL_CALL
+    static css::uno::Sequence<OUString>
     getSupportedServiceNames_Static();
 
-    static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
+    static css::uno::Reference<css::uno::XInterface> Create(
         css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
 
     rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index f3980dcdb810..8684012c47ac 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -239,7 +239,7 @@ css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
 
 
 css::uno::Reference< css::uno::XInterface >
-    SAL_CALL ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+    ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
 {
     return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB)));
 }
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 9c8188ebb21b..896dbecc7bb0 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -112,13 +112,13 @@ public:
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
 
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static();
+    static OUString getImplementationName_Static();
 
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence<OUString> SAL_CALL
+    static css::uno::Sequence<OUString>
     getSupportedServiceNames_Static();
 
-    static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
+    static css::uno::Reference<css::uno::XInterface> Create(
         css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
 
     // helper class
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index aa31acc516d1..1a4c3a639c9c 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -71,7 +71,7 @@ public:
     {   \
         return getImplementationName_Static();  \
     }   \
-    OUString SAL_CALL classname::getImplementationName_Static(  )    \
+    OUString classname::getImplementationName_Static(  )    \
     {   \
         return OUString(implasciiname); \
     }   \
@@ -93,7 +93,7 @@ public:
     {   \
         return getSupportedServiceNames_Static();   \
     }   \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  )   \
+    css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(  )   \
     {   \
         css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
         return aSupported;  \
@@ -104,7 +104,7 @@ public:
     {   \
         return getSupportedServiceNames_Static();   \
     }   \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  )   \
+    css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(  )   \
     {   \
         css::uno::Sequence< OUString > aSupported(2);   \
         aSupported[0] = serviceasciiname1;    \
@@ -135,7 +135,7 @@ public:
     IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \
     css::uno::Reference< css::uno::XInterface >   \
-        SAL_CALL classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)  \
+        classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)  \
     {   \
         return static_cast< XServiceInfo* >(new classname(_rxORB)); \
     }
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 3b3cb04dc522..02b3f04522ee 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -106,18 +106,18 @@ namespace sdbtools
         return getSupportedServiceNames_static();
     }
 
-    OUString SAL_CALL ConnectionTools::getImplementationName_static()
+    OUString ConnectionTools::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.dbaccess.ConnectionTools" );
     }
 
-    Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
+    Sequence< OUString > ConnectionTools::getSupportedServiceNames_static()
     {
         Sequence<OUString> aSupported { "com.sun.star.sdb.tools.ConnectionTools" };
         return aSupported;
     }
 
-    Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext )
+    Reference< XInterface > ConnectionTools::Create(const Reference< XComponentContext >& _rxContext )
     {
         return *( new ConnectionTools( Reference<XComponentContext>( _rxContext ) ) );
     }
diff --git a/dbaccess/source/sdbtools/inc/connectiontools.hxx b/dbaccess/source/sdbtools/inc/connectiontools.hxx
index b4b6b727a8cf..5e4837112b3f 100644
--- a/dbaccess/source/sdbtools/inc/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx
@@ -63,9 +63,9 @@ namespace sdbtools
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static versions
-        static OUString SAL_CALL getImplementationName_static();
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL
+        static OUString getImplementationName_static();
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static();
+        static css::uno::Reference< css::uno::XInterface >
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
         // XInitialization
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index e181050ece55..099ec1bef8d1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -177,7 +177,7 @@ Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames()
     return getSupportedServiceNames_Static();
 }
 
-Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OApplicationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new OApplicationController( comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 1daea6f5fd3f..9e40df4b2573 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -390,7 +390,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::frame::XController
         virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) override;
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index e4ce425cc3d0..fa8a4a1a8f97 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -85,7 +85,7 @@ public:
     }
     static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
@@ -106,7 +106,7 @@ extern "C" void createRegistryInfo_DBContentLoader()
     static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration;
 }
 
-Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory >  & rSMgr )
+Reference< XInterface > DBContentLoader::Create( const Reference< XMultiServiceFactory >  & rSMgr )
 {
     return *(new DBContentLoader(comphelper::getComponentContext(rSMgr)));
 }
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 2064f344e5cf..6c5b5d5dcc59 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -91,7 +91,7 @@ css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_
     return aSupported;
 }
 
-Reference< XInterface > SAL_CALL SbaExternalSourceBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > SbaExternalSourceBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new SbaExternalSourceBrowser( comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 2b534bc1cafa..2d5d39cab684 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -115,7 +115,7 @@ css::uno::Sequence<OUString> SAL_CALL SbaXGridControl::getSupportedServiceNames(
     return getSupportedServiceNames_Static();
 }
 
-Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > SbaXGridControl::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new SbaXGridControl( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a82590aeefe6..3f70fdb4e1b0 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -201,7 +201,7 @@ css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Stat
     return aSupported;
 }
 
-Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > SbaTableQueryBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     SolarMutexGuard aGuard;
     return *(new SbaTableQueryBrowser(comphelper::getComponentContext(_rxFactory)));
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index a779cb1757a7..35ab382c40fa 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -64,7 +64,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // OJoinController overridables
         virtual bool allowViews() const override;
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index add296253741..355d49f9e277 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -129,7 +129,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     private:
         void startTableListening();
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 8c1442d1b7d2..12333d3ef434 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -48,7 +48,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // UNO
         DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, SbaXDataBrowserController)
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index ab24420b1d6f..6e99796fc474 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -180,7 +180,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // XController
         virtual css::uno::Any SAL_CALL getViewData() override;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 776933fd89aa..efaf68834f66 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -78,7 +78,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::frame::XDispatch
         virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) override;
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index f41b0762d9e3..8f149a104722 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -142,7 +142,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController)
         // late construction
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 650527dc9efc..6a38537ab82f 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -53,7 +53,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index d2bfb7348d50..7b572a7722f4 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -125,7 +125,7 @@ IMPLEMENT_SERVICE_INFO_SUPPORTS(LimitBoxController)
 IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LimitBoxController, "com.sun.star.frame.ToolbarController")
 
 uno::Reference< uno::XInterface >
-    SAL_CALL LimitBoxController::Create(const uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+    LimitBoxController::Create(const uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
 {
     return static_cast< XServiceInfo* >(new LimitBoxController( comphelper::getComponentContext(_rxORB) ));
 }
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index 3928509c1e6c..721b9cc56ef7 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -43,11 +43,11 @@ class LimitBoxController: public svt::ToolboxController,
         /// XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         /// XComponent
         virtual void SAL_CALL dispose() override;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 4a4dc1f41436..aadc8f0fe7fa 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -124,7 +124,7 @@ namespace dbaui
             Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" };
             return aSupported;
         }
-        static Reference< XInterface > SAL_CALL Create(const Reference< XMultiServiceFactory >& _rM)
+        static Reference< XInterface > Create(const Reference< XMultiServiceFactory >& _rM)
         {
             return *(new OViewController(comphelper::getComponentContext(_rM)));
         }
@@ -299,7 +299,7 @@ Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames()
     return getSupportedServiceNames_Static();
 }
 
-Reference< XInterface > SAL_CALL OQueryController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OQueryController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new OQueryController(comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 233ee361c776..3bb0804ae42b 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -114,7 +114,7 @@ Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames()
     return getSupportedServiceNames_Static();
 }
 
-Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > ORelationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new ORelationController(comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 772bcb8bc27a..438497169b3f 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -128,7 +128,7 @@ Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames()
     return getSupportedServiceNames_Static();
 }
 
-Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OTableController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
 {
     return *(new OTableController(comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index f82b414af681..8a2bd3e88a84 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -55,7 +55,7 @@ namespace dbaui
         /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface >
-                SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+                Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
@@ -77,7 +77,7 @@ namespace dbaui
         return css::uno::Sequence<sal_Int8>();
     }
 
-    Reference< XInterface > SAL_CALL OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+    Reference< XInterface > OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
     {
         return *(new OAdvancedSettingsDialog( comphelper::getComponentContext(_rxFactory) ));
     }
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 720f0e40075c..859b100579f7 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -48,7 +48,7 @@ IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT)
 IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl)
 IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl")
 
-Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiServiceFactory >& _rxORB)
+Reference< XInterface > OColumnControl::Create(const Reference< XMultiServiceFactory >& _rxORB)
 {
     return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB)));
 }
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index 39e7f89247fa..1c0f7ffbfdbb 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -41,11 +41,11 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::awt::XControl
         virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) override;
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 400805e091be..705f9166376d 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -75,11 +75,11 @@ public:
 // css::lang::XServiceInfo
     DECLARE_SERVICE_INFO();
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static(  );
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface >
-    SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+    Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 355708d80624..fa119a03fd2c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > ODBTypeWizDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index d0fc12e261b1..a13e569b1f87 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -45,7 +45,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index d13cb0827cf7..35ea9b85292c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -61,7 +61,7 @@ Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > ODBTypeWizDialogSetup::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     Reference < XInterface > xDBWizard = *(new ODBTypeWizDialogSetup( comphelper::getComponentContext(_rxFactory) ));
     return xDBWizard;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 12f81aad6232..9c8be2e76b8c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -47,7 +47,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index c5420fa10a49..dc3462871a0d 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OTableFilterDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new OTableFilterDialog( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 114698dab832..3faf9dde83a1 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -46,7 +46,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index e340956961bb..ce7be4598215 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OUserSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new OUserSettingsDialog( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 75aba227b0ca..931d1c77a701 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -46,7 +46,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index 530cd12f7b81..e5ac2b416a4b 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > ODataSourcePropertyDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODataSourcePropertyDialog( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index f2941fe3a00c..38b2bf632c3e 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -45,7 +45,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
-            SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+            Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 5b2aa150563b..0af4b19d97ee 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -134,7 +134,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetFilterDialog, "com.sun.star.sdb.FilterDialog")
 
     css::uno::Reference< css::uno::XInterface >
-        SAL_CALL RowsetFilterDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+        RowsetFilterDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB)));
     }
@@ -182,7 +182,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetOrderDialog, "com.sun.star.sdb.OrderDialog")
 
     css::uno::Reference< css::uno::XInterface >
-        SAL_CALL RowsetOrderDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+        RowsetOrderDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB)));
     }
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 3238db70f1a5..7647a1f4d5b6 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -81,11 +81,11 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     protected:
         // own overridables
@@ -111,11 +111,11 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     protected:
         // own overridables
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index b6371ad59eb8..1aac50fbf4f6 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -341,7 +341,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(SQLExceptionInteractionHandler, "com.sun.star.sdb.DatabaseInteractionHandler")
 
     Reference< XInterface >
-        SAL_CALL SQLExceptionInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB)
+        SQLExceptionInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new SQLExceptionInteractionHandler(comphelper::getComponentContext(_rxORB)));
     }
@@ -352,7 +352,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LegacyInteractionHandler, "com.sun.star.sdb.InteractionHandler")
 
     Reference< XInterface >
-        SAL_CALL LegacyInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB)
+        LegacyInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new LegacyInteractionHandler(comphelper::getComponentContext(_rxORB)));
     }
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 09e59ca95349..19fa98b88369 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -134,11 +134,11 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
 
     // SQLExceptionInteractionHandler
@@ -168,11 +168,11 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 4c4034334b0f..609ad0362747 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -74,11 +74,11 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) override;
@@ -131,7 +131,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OTextConnectionSettingsDialog, "com.sun.star.sdb.TextConnectionSettings")
 
     css::uno::Reference< css::uno::XInterface >
-        SAL_CALL OTextConnectionSettingsDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+        OTextConnectionSettingsDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB)));
     }
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 5f7163dc7d88..56723e7a1f95 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -70,7 +70,7 @@ namespace dbaui
     IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG)
 
     css::uno::Reference< css::uno::XInterface >
-        SAL_CALL ODirectSQLDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+        ODirectSQLDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
     {
         return static_cast< XServiceInfo* >(new ODirectSQLDialog( comphelper::getComponentContext(_rxORB)));
     }
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index a6f7b827b570..c0e2a63b914a 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -51,11 +51,11 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  );
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 8b01455fdd11..a9f9791cc316 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -60,7 +60,7 @@ Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OSQLMessageDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new OSQLMessageDialog( comphelper::getComponentContext(_rxFactory) ));
 }