6 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index e0c2522e29e3..4069289670e0 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -108,13 +108,13 @@ OUString DocxExportFilter::getImplementationName()
     return DocxExport_getImplementationName();
 }
 
-uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw()
+uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw()
 {
     return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" };
 }
 
 /// @throws uno::Exception
-uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx )
+uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx )
 {
     return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx ));
 }
@@ -137,7 +137,7 @@ extern "C"
     { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
 };
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries );
 }
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 3a7454098294..f31ae9bba61b 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1437,8 +1437,8 @@ ErrCode SwRTFWriter::WriteStream()
     return ERRCODE_NONE;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF(const OUString& rFltName,
-                                                        const OUString& rBaseURL, WriterRef& xRet)
+extern "C" SAL_DLLPUBLIC_EXPORT void ExportRTF(const OUString& rFltName, const OUString& rBaseURL,
+                                               WriterRef& xRet)
 {
     xRet = new SwRTFWriter(rFltName, rBaseURL);
 }
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 61abb4a8a2f5..65d143595252 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -99,13 +99,13 @@ void RtfExportFilter::setSourceDocument(const uno::Reference<lang::XComponent>&
 
 OUString RtfExport_getImplementationName() { return OUString(IMPL_NAME_RTFEXPORT); }
 
-uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept
+uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept
 {
     return uno::Sequence<OUString>{ "com.sun.star.document.ExportFilter" };
 }
 
 uno::Reference<uno::XInterface>
-    SAL_CALL RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx)
+RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx)
 {
     return static_cast<cppu::OWeakObject*>(new RtfExportFilter(xCtx));
 }
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 472c3c1d5a86..e8cd635585c6 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -57,10 +57,10 @@ public:
 };
 
 OUString RtfExport_getImplementationName();
-css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept;
+css::uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept;
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface>
-    SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx);
+RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx);
 
 #define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport"
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c67d69cceb12..3f6c736f2bd1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3680,18 +3680,18 @@ SwWW8Writer::~SwWW8Writer()
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName )
 {
     SvxImportMSVBasic aTmp( rDoc, rStor );
     return sal_uInt32(aTmp.SaveOrDelMSVBAStorage( bSaveInto, rStorageName ));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet )
+extern "C" SAL_DLLPUBLIC_EXPORT void ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet )
 {
     xRet = new SwWW8Writer( rFltName, rBaseURL );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL GetSaveWarningOfMSVBAStorage_ww8(  SfxObjectShell &rDocS )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 GetSaveWarningOfMSVBAStorage_ww8(  SfxObjectShell &rDocS )
 {
     return sal_uInt32(SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS ));
 }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a60a0971f687..c6d829c4c915 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6203,7 +6203,7 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss)
     return nErrRet;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC()
+extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportDOC()
 {
     return new WW8Reader;
 }
@@ -6220,7 +6220,7 @@ namespace
     };
 }
 
-bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
+bool TestImportDOC(SvStream &rStream, const OUString &rFltName)
 {
     FontCacheGuard aFontCacheGuard;
     std::unique_ptr<Reader> xReader(ImportDOC());
@@ -6264,17 +6264,17 @@ bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
     return bRet;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW8(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW8(SvStream &rStream)
 {
     return TestImportDOC(rStream, "CWW8");
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW6(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW6(SvStream &rStream)
 {
     return TestImportDOC(rStream, "CWW6");
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW2(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW2(SvStream &rStream)
 {
     return TestImportDOC(rStream, "WW6");
 }