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>

14 files changed, 212 insertions, 212 deletions

diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index d19ad010913f..aac65f11862e 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -34,281 +34,281 @@ namespace com { namespace sun { namespace star {
 } } }
 
 // impress oasis import
-OUString SAL_CALL XMLImpressImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressImportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressStylesImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesImportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressStylesImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressStylesImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressStylesImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressContentImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressContentImportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressContentImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressContentImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressContentImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressMetaImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaImportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressMetaImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressMetaImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressMetaImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressSettingsImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressSettingsImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress oasis export
-OUString SAL_CALL XMLImpressExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressStylesExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressStylesExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressStylesExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressContentExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressContentExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressContentExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressMetaExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressMetaExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressMetaExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressSettingsExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
+OUString XMLImpressSettingsExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress OOo import
 
 // impress OOo export
-OUString SAL_CALL XMLImpressExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressStylesExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressStylesExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressStylesExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressStylesExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressContentExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressContentExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressContentExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressMetaExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressMetaExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLImpressSettingsExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressSettingsExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis import
-OUString SAL_CALL XMLDrawImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawImportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawStylesImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawStylesImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawStylesImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawContentImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawContentImportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawContentImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawContentImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawContentImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawMetaImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaImportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawMetaImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawMetaImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawMetaImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawSettingsImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsImportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawSettingsImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawSettingsImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsImportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawSettingsImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis export
-OUString SAL_CALL XMLDrawExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawStylesExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawStylesExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawStylesExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawStylesExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawContentExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawContentExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawContentExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawMetaExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawMetaExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawMetaExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawSettingsExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
+OUString XMLDrawSettingsExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOasis_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw OOo import
 
 // draw OOo export
-OUString SAL_CALL XMLDrawExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawStylesExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawStylesExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawStylesExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawStylesExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawContentExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawContentExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawContentExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawMetaExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL XMLDrawSettingsExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawSettingsExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawSettingsExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress animation import
-OUString SAL_CALL AnimationsImport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL AnimationsImport_getSupportedServiceNames() throw();
+OUString AnimationsImport_getImplementationName() throw();
+css::uno::Sequence<OUString> AnimationsImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL AnimationsImport_createInstance(
+css::uno::Reference<css::uno::XInterface> AnimationsImport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // drawing layer export
-OUString SAL_CALL XMLDrawingLayerExport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLDrawingLayerExport_getSupportedServiceNames() throw();
+OUString XMLDrawingLayerExport_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLDrawingLayerExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawingLayerExport_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLDrawingLayerExport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress xml clipboard export
-OUString SAL_CALL XMLImpressClipboardExport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLImpressClipboardExport_getSupportedServiceNames() throw();
+OUString XMLImpressClipboardExport_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLImpressClipboardExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressClipboardExport_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLImpressClipboardExport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart oasis import
-OUString SAL_CALL SchXMLImport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLImport_getSupportedServiceNames() throw();
+OUString SchXMLImport_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLImport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw();
+OUString SchXMLImport_Meta_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLImport_Meta_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Meta_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLImport_Meta_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw();
+OUString SchXMLImport_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLImport_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Styles_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLImport_Styles_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw();
+OUString SchXMLImport_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLImport_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Content_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLImport_Content_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart oasis export
-OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw();
+OUString SchXMLExport_Oasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Oasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw();
+OUString SchXMLExport_Oasis_Meta_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Meta_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Meta_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw();
+OUString SchXMLExport_Oasis_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Styles_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Styles_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw();
+OUString SchXMLExport_Oasis_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Oasis_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Content_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Content_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart OOo import
 
 // chart OOo export
-OUString SAL_CALL SchXMLExport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_getSupportedServiceNames() throw();
+OUString SchXMLExport_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw();
+OUString SchXMLExport_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Styles_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Styles_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw();
+OUString SchXMLExport_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SchXMLExport_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Content_createInstance(
+css::uno::Reference<css::uno::XInterface> SchXMLExport_Content_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // meta export OOo
-OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw();
+OUString XMLMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLMetaExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event export
-OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw();
+OUString XMLAutoTextEventExport_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLAutoTextEventExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExport_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLAutoTextEventExport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event import
-OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw();
+OUString XMLAutoTextEventImport_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLAutoTextEventImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImport_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLAutoTextEventImport_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event export OOo
-OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
+OUString XMLAutoTextEventExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExportOOO_createInstance(
+css::uno::Reference<css::uno::XInterface> XMLAutoTextEventExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 #endif
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 0b9c79f38e32..b28ec1b60ff0 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3673,34 +3673,34 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
 
 // first version: everything goes in one storage
 
-Sequence< OUString > SAL_CALL SchXMLExport_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_getImplementationName() throw()
+OUString SchXMLExport_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Compact"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     // #103997# removed some flags from EXPORT_ALL
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )));
 }
 
 // Oasis format
-Sequence< OUString > SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Oasis_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw()
+OUString SchXMLExport_Oasis_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Oasis.Compact"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     // #103997# removed some flags from EXPORT_ALL
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr),
@@ -3710,80 +3710,80 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re
 
 // multiple storage version: one for content / styles / meta
 
-Sequence< OUString > SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Styles_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLStylesExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
+OUString SchXMLExport_Styles_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr)
+Reference< uno::XInterface > SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES ));
 }
 
 // Oasis format
-Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw()
+OUString SchXMLExport_Oasis_Styles_getImplementationName() throw()
 {
     return OUString( "SchXMLExport.Oasis.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS ));
 }
 
-Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Content_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLContentExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
+OUString SchXMLExport_Content_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Content" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS ));
 }
 
 // Oasis format
-Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Oasis_Content_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw()
+OUString SchXMLExport_Oasis_Content_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Oasis.Content" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS ));
 }
 
 // Oasis format
-Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaExporter" };
 }
 
-OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw()
+OUString SchXMLExport_Oasis_Meta_getImplementationName() throw()
 {
     return OUString(  "SchXMLExport.Oasis.Meta" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS  ));
 }
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index b7dc42566ec3..b5f604b52d23 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -607,64 +607,64 @@ void SAL_CALL SchXMLImport::setTargetDocument(const uno::Reference<lang::XCompon
 
 // first version: everything comes from one storage
 
-Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLImport_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisImporter" };
 }
 
-OUString SAL_CALL SchXMLImport_getImplementationName() throw()
+OUString SchXMLImport_getImplementationName() throw()
 {
     return OUString(  "SchXMLImport"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
 }
 
 // multiple storage version: one for content / styles / meta
 
-Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLImport_Styles_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesImporter" };
 }
 
-OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
+OUString SchXMLImport_Styles_getImplementationName() throw()
 {
     return OUString( "SchXMLImport.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES ));
 }
 
-Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLImport_Content_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentImporter" };
 }
 
-OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
+OUString SchXMLImport_Content_getImplementationName() throw()
 {
     return OUString(  "SchXMLImport.Content"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS ));
 }
 
-Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw()
+Sequence< OUString > SchXMLImport_Meta_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaImporter" };
 }
 
-OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
+OUString SchXMLImport_Meta_getImplementationName() throw()
 {
     return OUString(  "SchXMLImport.Meta"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
+Reference< uno::XInterface > SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
 }
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index f38a2e2eb860..a1a5e909fa9d 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -44,7 +44,7 @@ extern "C"
                 classname##_getSupportedServiceNames() );\
         }
 
-XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = nullptr;
     if( pServiceManager )
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 75553fa8a1cd..af8875e7056c 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -89,12 +89,12 @@ using ::com::sun::star::container::XEnumeration;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::lang::XInitialization;
 
-Sequence< OUString > SAL_CALL AnimationsImport_getSupportedServiceNames() throw()
+Sequence< OUString > AnimationsImport_getSupportedServiceNames() throw()
 {
     return Sequence< OUString > { "com.sun.star.comp.Xmloff.AnimationsImport" };
 }
 
-OUString SAL_CALL AnimationsImport_getImplementationName() throw()
+OUString AnimationsImport_getImplementationName() throw()
 {
     return OUString( "xmloff::AnimationsImport" );
 }
@@ -1409,7 +1409,7 @@ void AnimationNodeContext::postProcessRootNode( const Reference< XAnimationNode
 
 } // namespace xmloff
 
-Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new xmloff::AnimationsImport( comphelper::getComponentContext(rSMgr) ));
 }
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index db1ed653958f..ee5f5229bf48 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -176,13 +176,13 @@ void XMLMetaExportComponent::ExportAutoStyles_() {}
 void XMLMetaExportComponent::ExportMasterStyles_() {}
 void XMLMetaExportComponent::ExportContent_() {}
 
-uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames()
+uno::Sequence< OUString > XMLMetaExportOOO_getSupportedServiceNames()
     throw()
 {
     return uno::Sequence< OUString > { "com.sun.star.document.XMLMetaExporter" };
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 XMLMetaExportComponent_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
@@ -190,12 +190,12 @@ XMLMetaExportComponent_get_implementation(
     return cppu::acquire(new XMLMetaExportComponent(context, "XMLMetaExportComponent", SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
 }
 
-OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw()
+OUString XMLMetaExportOOO_getImplementationName() throw()
 {
     return OUString( "XMLMetaExportOOo" );
 }
 
-uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
+uno::Reference< uno::XInterface > XMLMetaExportOOO_createInstance(
         const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META));
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 2159916ad9cc..45756e5343b2 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -54,7 +54,7 @@ protected:
 
 // global functions to support the component
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 XMLMetaImportComponent_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 48104f58ff34..6aa6b7979e0a 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -443,7 +443,7 @@ XMLVersionListPersistence::getSupportedServiceNames()
         "com.sun.star.document.DocumentRevisionListPersistence"};
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 XMLVersionListPersistence_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 3066d047a30f..0853e44d78b4 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -202,19 +202,19 @@ void XMLAutoTextEventExport::ExportContent_() {}
 
 // methods to support the component registration
 
-Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames()
+Sequence< OUString > XMLAutoTextEventExport_getSupportedServiceNames()
     throw()
 {
     Sequence<OUString> aSeq { XMLAutoTextEventExport_getImplementationName() };
     return aSeq;
 }
 
-OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw()
+OUString XMLAutoTextEventExport_getImplementationName() throw()
 {
     return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"  );
 }
 
-Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
+Reference< XInterface > XMLAutoTextEventExport_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS));
@@ -222,19 +222,19 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
 
 // methods to support the component registration
 
-Sequence< OUString > SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames()
+Sequence< OUString > XMLAutoTextEventExportOOO_getSupportedServiceNames()
     throw()
 {
     Sequence<OUString> aSeq { XMLAutoTextEventExportOOO_getImplementationName() };
     return aSeq;
 }
 
-OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw()
+OUString XMLAutoTextEventExportOOO_getImplementationName() throw()
 {
     return OUString( "com.sun.star.comp.Writer.XMLAutotextEventsExporter"  );
 }
 
-Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance(
+Reference< XInterface > XMLAutoTextEventExportOOO_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL));
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 285a8ca1d13b..2a21108b81b0 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -103,7 +103,7 @@ SvXMLImportContext* XMLAutoTextEventImport::CreateDocumentContext(
 }
 
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString >
     XMLAutoTextEventImport_getSupportedServiceNames()
         throw()
 {
@@ -111,12 +111,12 @@ Sequence< OUString > SAL_CALL
     return aSeq;
 }
 
-OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw()
+OUString XMLAutoTextEventImport_getImplementationName() throw()
 {
     return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" );
 }
 
-Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance(
+Reference< XInterface > XMLAutoTextEventImport_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) ));
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 741cc56c9f43..6756fb50199d 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1985,19 +1985,19 @@ Sequence< css::uno::Type > SAL_CALL
 
 // Service registration
 
-OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw()
+OUString OOo2OasisTransformer_getImplementationName() throw()
 {
     return OUString( "com.sun.star.comp.OOo2OasisTransformer" );
 }
 
-Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw()
+Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw()
 {
     const OUString aServiceName( OOo2OasisTransformer_getImplementationName() );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
-Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
+Reference< XInterface > OOo2OasisTransformer_createInstance(
         const Reference< XMultiServiceFactory > & )
 {
     return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer());
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 3c1d47121d8d..5a981090c6ff 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1956,12 +1956,12 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames(  )
 
 // Service registration
 
-OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw()
+OUString Oasis2OOoTransformer_getImplementationName() throw()
 {
     return OUString( "com.sun.star.comp.Oasis2OOoTransformer" );
 }
 
-Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
+Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames()
     throw()
 {
     const OUString aServiceName( Oasis2OOoTransformer_getImplementationName() );
@@ -1969,7 +1969,7 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
     return aSeq;
 }
 
-Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
+Reference< XInterface > Oasis2OOoTransformer_createInstance(
         const Reference< XMultiServiceFactory > &)
 {
     SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 8e1fe66d1080..2c35501227b2 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -31,9 +31,9 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    typedef OUString (SAL_CALL * GetImplementationName)();
-    typedef uno::Sequence< OUString > (SAL_CALL * GetSupportedServiceNames)();
-    typedef uno::Reference< ::uno::XInterface > (SAL_CALL * CreateInstance)(
+    typedef OUString (* GetImplementationName)();
+    typedef uno::Sequence< OUString > (* GetSupportedServiceNames)();
+    typedef uno::Reference< ::uno::XInterface > (* CreateInstance)(
         const uno::Reference< lang::XMultiServiceFactory >& );
 
     struct ServiceDescriptor
@@ -86,7 +86,7 @@ namespace
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = nullptr;
     if( pServiceManager )
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 67747352c621..767bcfae4a7b 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -22,16 +22,16 @@
 
 #include <sal/config.h>
 
-OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
+OUString OOo2OasisTransformer_getImplementationName() throw();
+css::uno::Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
+css::uno::Reference< css::uno::XInterface > OOo2OasisTransformer_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
-OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
+OUString Oasis2OOoTransformer_getImplementationName() throw();
+css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
+css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();