loplugin:salcall (clang-cl)

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

16 files changed, 68 insertions, 68 deletions

diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 5921796d5946..c916bd5e0b60 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -190,13 +190,13 @@ void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
         removeClipboard(xClipboard->getName());
 }
 
-Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
+Reference< XInterface > ClipboardManager_createInstance(
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
 {
     return Reference < XInterface >(static_cast<OWeakObject *>(new ClipboardManager()));
 }
 
-Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
+Sequence< OUString > ClipboardManager_getSupportedServiceNames()
 {
     Sequence < OUString > SupportedServicesNames { "com.sun.star.datatransfer.clipboard.ClipboardManager" };
     return SupportedServicesNames;
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 5d4889e9d53e..e3217f6bf6bb 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -90,8 +90,8 @@ namespace dtrans
 
 }
 
-css::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames();
-css::uno::Reference< css::uno::XInterface > SAL_CALL ClipboardManager_createInstance(
+css::uno::Sequence< OUString > ClipboardManager_getSupportedServiceNames();
+css::uno::Reference< css::uno::XInterface > ClipboardManager_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 86fe4f5d76bb..edc78bc355a0 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -29,7 +29,7 @@ using namespace cppu;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL dtrans_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * dtrans_component_getFactory(
     const sal_Char * pImplName,
     void * pServiceManager,
     void * /*pRegistryKey*/
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 216bd578ebc4..d499591f343a 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -137,13 +137,13 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb
         rBHelper.aLC.removeInterface( cppu::UnoType<XClipboardListener>::get(), listener );
 }
 
-Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
+Sequence< OUString > GenericClipboard_getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.GenericClipboard" };
     return aRet;
 }
 
-Reference< XInterface > SAL_CALL GenericClipboard_createInstance(
+Reference< XInterface > GenericClipboard_createInstance(
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
 {
     return Reference < XInterface >(static_cast<OWeakObject *>(new GenericClipboard()));
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index f245096e9c60..2b31d063229c 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -101,8 +101,8 @@ namespace dtrans
 
 }
 
-css::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames();
-css::uno::Reference< css::uno::XInterface > SAL_CALL GenericClipboard_createInstance(
+css::uno::Sequence< OUString > GenericClipboard_getSupportedServiceNames();
+css::uno::Reference< css::uno::XInterface > GenericClipboard_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 77f17a7506d1..3963fa48b289 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star::lang;
 
 namespace
 {
-    Sequence< OUString > SAL_CALL WinClipboard_getSupportedServiceNames()
+    Sequence< OUString > WinClipboard_getSupportedServiceNames()
     {
         Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
         return aRet;
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 5e379bd894e0..df60bba1eaaa 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -39,7 +39,7 @@ namespace
     // @param rServiceManager - service manager, useful if the component needs other uno services
     // so we should give it to every UNO-Implementation component
 
-    Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
+    Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
     {
         return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), "" ) ) );
     }
@@ -51,7 +51,7 @@ extern "C"
 // component_getFactory
 // returns a factory to create XFilePicker-Services
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* sysdtrans_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 83e972a2be38..8bce76cfbb1d 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.cxx
@@ -29,13 +29,13 @@ using namespace ::com::sun::star::registry  ;
 using namespace ::cppu                      ;
 using namespace ::com::sun::star::lang;
 
-Reference< XInterface > SAL_CALL createDragSource( const Reference< XMultiServiceFactory >& rServiceManager )
+Reference< XInterface > createDragSource( const Reference< XMultiServiceFactory >& rServiceManager )
 {
     DragSource* pSource= new DragSource( comphelper::getComponentContext(rServiceManager) );
     return Reference<XInterface>( static_cast<XInitialization*>(pSource), UNO_QUERY);
 }
 
-Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServiceFactory >& rServiceManager )
+Reference< XInterface > createDropTarget( const Reference< XMultiServiceFactory >& rServiceManager )
 {
     DropTarget* pTarget= new DropTarget( comphelper::getComponentContext(rServiceManager) );
     return Reference<XInterface>( static_cast<XInitialization*>(pTarget), UNO_QUERY);
@@ -44,7 +44,7 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL
+SAL_DLLPUBLIC_EXPORT void*
 dnd_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 92fecd840a36..2b84729199f6 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -122,13 +122,13 @@ Any byteStreamToAny( CDOTransferable::ByteSequence_t& aByteStream, const Type& a
     return aAny;
 }
 
-bool SAL_CALL cmpFullMediaType(
+bool cmpFullMediaType(
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs )
 {
     return xLhs->getFullMediaType().equalsIgnoreAsciiCase( xRhs->getFullMediaType( ) );
 }
 
-bool SAL_CALL cmpAllContentTypeParameter(
+bool cmpAllContentTypeParameter(
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs )
 {
     Sequence< OUString > xLhsFlavors = xLhs->getParameters( );
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 0a284290b51b..2931521511fb 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -58,7 +58,7 @@ struct METAFILEHEADER
 
 // convert a windows metafile picture to a openoffice metafile picture
 
-Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFilePict )
+Sequence< sal_Int8 > WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFilePict )
 {
     OSL_ASSERT( aMetaFilePict.getLength( ) == sizeof( METAFILEPICT ) );
 
@@ -128,7 +128,7 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
 
 // convert a windows enhanced metafile to a openoffice metafile
 
-Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile )
+Sequence< sal_Int8 > WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile )
 {
     Sequence< sal_Int8 >    aRet;
     UINT                    nSize = 0;
@@ -147,7 +147,7 @@ Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile
 
 // convert a openoffice metafile picture to a windows metafile picture
 
-HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 > const & aOOMetaFilePict )
+HMETAFILEPICT OOMFPictToWinMFPict( Sequence< sal_Int8 > const & aOOMetaFilePict )
 {
     HMETAFILEPICT   hPict = nullptr;
     HMETAFILE       hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(), reinterpret_cast<unsigned char const *>(aOOMetaFilePict.getConstArray()) );
@@ -169,7 +169,7 @@ HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 > const & aOOMeta
 
 // convert a openoffice metafile picture to a windows enhanced metafile picture
 
-HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 > const & aOOMetaFilePict )
+HENHMETAFILE OOMFPictToWinENHMFPict( Sequence< sal_Int8 > const & aOOMetaFilePict )
 {
     HENHMETAFILE hEnhMtf = SetEnhMetaFileBits( aOOMetaFilePict.getLength(), reinterpret_cast<unsigned char const *>(aOOMetaFilePict.getConstArray()) );
 
@@ -178,7 +178,7 @@ HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 > const & aOOMe
 
 // convert a windows device independent bitmap into a openoffice bitmap
 
-Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
+Sequence< sal_Int8 > WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
 {
     OSL_ENSURE(sal_uInt32(aWinDIB.getLength()) > sizeof(BITMAPINFOHEADER), "CF_DIBV5/CF_DIB too small (!)");
     Sequence< sal_Int8 > ooBmpStream;
@@ -211,7 +211,7 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB
 
 // convert a openoffice bitmap into a windows device independent bitmap
 
-Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
+Sequence< sal_Int8 > OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
 {
     Sequence< sal_Int8 > winDIBStream( aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) );
 
@@ -243,7 +243,7 @@ const std::string TAG_END_HTML = std::string("</html>");
 const std::string TAG_BODY = std::string("<body");
 const std::string TAG_END_BODY = std::string("</body");
 
-Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml)
+Sequence<sal_Int8> TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml)
 {
     OSL_ASSERT(aTextHtml.getLength() > 0);
 
@@ -403,7 +403,7 @@ ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal)
 
 // convert a windows bitmap handle into a openoffice bitmap
 
-Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP aHBMP )
+Sequence< sal_Int8 > WinBITMAPToOOBMP( HBITMAP aHBMP )
 {
     Sequence< sal_Int8 > ooBmpStream;
 
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index da14a374c979..bcc028f8248a 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -40,29 +40,29 @@
     input:
     aMetaFilePict - a sequence of bytes containing a METAFILEPICT struct
 ------------------------------------------------------------------------*/
-css::uno::Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( css::uno::Sequence< sal_Int8 >& aMetaFilePict );
-css::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile );
+css::uno::Sequence< sal_Int8 > WinMFPictToOOMFPict( css::uno::Sequence< sal_Int8 >& aMetaFilePict );
+css::uno::Sequence< sal_Int8 > WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile );
 
 /*------------------------------------------------------------------------
     input:
     aByteStream - a sequence of bytes containing a openoffice metafile
                   picture with a leading METAFILEHEADER
 ------------------------------------------------------------------------*/
-HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( css::uno::Sequence< sal_Int8 > const & aOOMetaFilePict );
-HENHMETAFILE  SAL_CALL OOMFPictToWinENHMFPict( css::uno::Sequence< sal_Int8 > const & aOOMetaFilePict );
+HMETAFILEPICT OOMFPictToWinMFPict( css::uno::Sequence< sal_Int8 > const & aOOMetaFilePict );
+HENHMETAFILE  OOMFPictToWinENHMFPict( css::uno::Sequence< sal_Int8 > const & aOOMetaFilePict );
 
 /*------------------------------------------------------------------------
     input:
     aWinDIB - sequence of bytes containing a windows device independent
               bitmap
 ------------------------------------------------------------------------*/
-css::uno::Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const css::uno::Sequence< sal_Int8 >& aWinDIB );
+css::uno::Sequence< sal_Int8 > WinDIBToOOBMP( const css::uno::Sequence< sal_Int8 >& aWinDIB );
 
 /*------------------------------------------------------------------------
     input:
     aWinDIB - sequence of bytes containing a windows bitmap handle
 ------------------------------------------------------------------------*/
-css::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP );
+css::uno::Sequence< sal_Int8 > WinBITMAPToOOBMP( HBITMAP );
 
 /*------------------------------------------------------------------------
     input:
@@ -70,7 +70,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP );
     May contain CF_DIBV5 or CF_DIB, but removing the BITMAPFILEHEADER
     is always the same size
 ------------------------------------------------------------------------*/
-css::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( css::uno::Sequence< sal_Int8 >& aOOBmp );
+css::uno::Sequence< sal_Int8 > OOBmpToWinDIB( css::uno::Sequence< sal_Int8 >& aOOBmp );
 
 /*------------------------------------------------------------------------
     input:
@@ -79,7 +79,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( css::uno::Sequence< sal_I
     the Format is described in the MSDN Library under HTML Clipboard
     Format
 ------------------------------------------------------------------------*/
-css::uno::Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( css::uno::Sequence< sal_Int8 > const & aTextHtml );
+css::uno::Sequence< sal_Int8 > TextHtmlToHTMLFormat( css::uno::Sequence< sal_Int8 > const & aTextHtml );
 
 /**
     Return a FileList in which Windows Shell Links (lnk) are resolved.
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 65830690fc6d..075f3871c5f3 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::lang;
 
 namespace {
 
-void SAL_CALL setupStgMedium( const FORMATETC& fetc,
+void setupStgMedium( const FORMATETC& fetc,
                                              CStgTransferHelper& stgTransHlp,
                                              STGMEDIUM& stgmedium )
 {
@@ -141,13 +141,13 @@ void validateFormatEtc( LPFORMATETC lpFormatEtc )
 }
 
 inline
-void SAL_CALL invalidateStgMedium( STGMEDIUM& stgmedium )
+void invalidateStgMedium( STGMEDIUM& stgmedium )
 {
     stgmedium.tymed = TYMED_NULL;
 }
 
 inline
-HRESULT SAL_CALL translateStgExceptionCode( HRESULT hr )
+HRESULT translateStgExceptionCode( HRESULT hr )
 {
     HRESULT hrTransl;
 
@@ -166,7 +166,7 @@ HRESULT SAL_CALL translateStgExceptionCode( HRESULT hr )
 }
 
 // inline
-void SAL_CALL renderDataAndSetupStgMedium(
+void renderDataAndSetupStgMedium(
     const sal_Int8* lpStorage, const FORMATETC& fetc, sal_uInt32 nInitStgSize,
     sal_uInt32 nBytesToTransfer, STGMEDIUM& stgmedium )
 {
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 64962aecf05a..c395d4e70e31 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star::container;
 
 namespace
 {
-    Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( )
+    Sequence< OUString > DataFormatTranslator_getSupportedServiceNames( )
     {
         Sequence< OUString > aRet { "com.sun.star.datatransfer.DataFormatTranslator" };
         return aRet;
@@ -360,7 +360,7 @@ static const std::vector< FormatEntry > g_TranslTable {
 
 namespace {
 
-void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor )
+void findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor )
 {
     /*
         we break the for loop if we find the first CF_INVALID
@@ -382,7 +382,7 @@ void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, Da
     }
 }
 
-void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor )
+void findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor )
 {
     vector< FormatEntry >::const_iterator citer_end = g_TranslTable.end( );
     for ( vector< FormatEntry >::const_iterator citer = g_TranslTable.begin( );
@@ -397,7 +397,7 @@ void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatNa
     }
 }
 
-void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny )
+void findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny )
 {
     if ( aCharset.equalsIgnoreAsciiCase( "utf-16" ) )
         aAny <<= static_cast< sal_Int32 >( CF_UNICODETEXT );
@@ -409,7 +409,7 @@ void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, Any& aAn
     }
 }
 
-void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny )
+void setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny )
 {
     vector< FormatEntry >::const_iterator citer_end = g_TranslTable.end( );
     for ( vector< FormatEntry >::const_iterator citer = g_TranslTable.begin( ); citer != citer_end; ++citer )
@@ -423,7 +423,7 @@ void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFor
     }
 }
 
-void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType(
+void findStdFormatIdOrNativeFormatNameForFullMediaType(
     const Reference< XMimeContentTypeFactory >& aRefXMimeFactory,
     const OUString& aFullMediaType,
     Any& aAny )
@@ -454,7 +454,7 @@ inline bool isTextPlainMediaType( const OUString& fullMediaType )
     return fullMediaType.equalsIgnoreAsciiCase("text/plain");
 }
 
-DataFlavor SAL_CALL mkDataFlv(const OUString& cnttype, const OUString& hpname, Type dtype)
+DataFlavor mkDataFlv(const OUString& cnttype, const OUString& hpname, Type dtype)
 {
     DataFlavor dflv;
     dflv.MimeType             = cnttype;
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 8139b4a6b6b3..4d8789f4686c 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -41,7 +41,7 @@ namespace
     // @param rServiceManager - service manager, useful if the component needs other uno services
     // so we should give it to every UNO-Implementation component
 
-    Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
+    Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
     {
         return Reference< XInterface >( static_cast< XDataFormatTranslator* >( new CDataFormatTranslatorUNO( comphelper::getComponentContext(rServiceManager) ) ) );
     }
@@ -50,7 +50,7 @@ namespace
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* ftransl_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 356985a931f8..04ef70787539 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -44,7 +44,7 @@
 // returns a windows codepage appropriate to the
 // given mime charset parameter value
 
-sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
+sal_uInt32 getWinCPFromMimeCharset( const OUString& charset )
 {
     sal_uInt32 winCP = GetACP( );
 
@@ -74,7 +74,7 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
 // returns a windows codepage appropriate to the
 // given locale and locale type
 
-OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
+OUString getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 {
     OSL_ASSERT( IsValidLocale( lcid, LCID_SUPPORTED ) );
 
@@ -119,7 +119,7 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 // to the given codepage, optional a prefix can be
 // given, e.g. "windows-" or "cp"
 
-OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefix )
+OUString getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefix )
 {
     return aPrefix + cptostr( cp );
 }
@@ -128,7 +128,7 @@ OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefi
 // to the given locale id and locale type, optional a
 // prefix can be given, e.g. "windows-" or "cp"
 
-OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OUString& aPrefix  )
+OUString getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OUString& aPrefix  )
 {
     OUString charset = getWinCPFromLocaleId( lcid, lctype );
     return aPrefix + charset;
@@ -136,7 +136,7 @@ OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OU
 
 // IsOEMCP
 
-bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
+bool IsOEMCP( sal_uInt32 codepage )
 {
     OSL_ASSERT( IsValidCodePage( codepage ) );
 
@@ -154,7 +154,7 @@ bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
 
 // converts a codepage into its string representation
 
-OUString SAL_CALL cptostr( sal_uInt32 codepage )
+OUString cptostr( sal_uInt32 codepage )
 {
     OSL_ASSERT( IsValidCodePage( codepage ) );
 
@@ -169,7 +169,7 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
 //
 // Return Value:
 //    SCODE  -  S_OK if successful
-void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
+void DeleteTargetDevice( DVTARGETDEVICE* ptd )
 {
     __try
     {
@@ -196,7 +196,7 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 //    pointer to allocated copy of ptdSrc
 //    if ptdSrc==NULL then returns NULL is returned.
 //    if ptdSrc!=NULL and memory allocation fails, then NULL is returned
-DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
+DVTARGETDEVICE* CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 {
     DVTARGETDEVICE* ptdDest = nullptr;
 
@@ -238,7 +238,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 //  returns TRUE if copy was successful;
 //  returns FALSE if not successful, e.g. one or both of the pointers
 //  were invalid or the pointers were equal
-bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
+bool CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
 {
     bool bRet = false;
 
@@ -274,7 +274,7 @@ bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
 // -1 for partial match (which is defined to mean the left is a subset
 //    of the right: fewer aspects, null target device, fewer medium).
 
-sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC* pFetcRhs )
+sal_Int32 CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC* pFetcRhs )
 {
     sal_Int32 nMatch = FORMATETC_EXACT_MATCH;
 
@@ -326,7 +326,7 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
     return nMatch;
 }
 
-bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE const * ptdRight )
+bool CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE const * ptdRight )
 {
     bool bRet = false;
 
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index 3ba825062b4b..a6121bb34d12 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -36,47 +36,47 @@
 #endif
 
 // target device and formatetc helper
-void      SAL_CALL DeleteTargetDevice(DVTARGETDEVICE* ptd);
-bool  SAL_CALL CopyFormatEtc(LPFORMATETC petcDest, LPFORMATETC petcSrc);
-sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLeft, const FORMATETC* pFetcRight);
-bool  SAL_CALL CompareTargetDevice(DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE const * ptdRight);
-DVTARGETDEVICE* SAL_CALL CopyTargetDevice(DVTARGETDEVICE* ptdSrc);
+void DeleteTargetDevice(DVTARGETDEVICE* ptd);
+bool CopyFormatEtc(LPFORMATETC petcDest, LPFORMATETC petcSrc);
+sal_Int32 CompareFormatEtc( const FORMATETC* pFetcLeft, const FORMATETC* pFetcRight);
+bool CompareTargetDevice(DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE const * ptdRight);
+DVTARGETDEVICE* CopyTargetDevice(DVTARGETDEVICE* ptdSrc);
 
 // some codepage helper functions
 
 // returns a windows codepage appropriate to the
 // given mime charset parameter value
 
-sal_uInt32 SAL_CALL getWinCPFromMimeCharset(
+sal_uInt32 getWinCPFromMimeCharset(
     const OUString& charset );
 
 // returns a windows codepage appropriate to the
 // given locale and locale type
 
-OUString SAL_CALL getWinCPFromLocaleId(
+OUString getWinCPFromLocaleId(
     LCID lcid, LCTYPE lctype );
 
 // returns a mime charset parameter value appropriate
 // to the given codepage, optional a prefix can be
 // given, e.g. "windows-" or "cp"
 
-OUString SAL_CALL getMimeCharsetFromWinCP(
+OUString getMimeCharsetFromWinCP(
     sal_uInt32 cp, const OUString& aPrefix );
 
 // returns a mime charset parameter value appropriate
 // to the given locale id and locale type, optional a
 // prefix can be given, e.g. "windows-" or "cp"
 
-OUString SAL_CALL getMimeCharsetFromLocaleId(
+OUString getMimeCharsetFromLocaleId(
     LCID lcid, LCTYPE lctype, const OUString& aPrefix  );
 
 // returns true, if a given codepage is an oem codepage
 
-bool SAL_CALL IsOEMCP( sal_uInt32 codepage );
+bool IsOEMCP( sal_uInt32 codepage );
 
 // converts a codepage into a string representation
 
-OUString SAL_CALL cptostr( sal_uInt32 codepage );
+OUString cptostr( sal_uInt32 codepage );
 
 #endif