summaryrefslogtreecommitdiff
path: root/dtrans/source/win32/dtobj
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-15 10:21:55 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-15 14:46:51 +0100
commitc3250baa4a8029817f0d7fcaee8b9ffe169c6cb7 (patch)
treecfdd547dfe4e3c9ae5bf22123a4f1d99ea84d94b /dtrans/source/win32/dtobj
parent65ee299a0c0e9044d809e58c3c5e75d05ad76f0e (diff)
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>
Diffstat (limited to 'dtrans/source/win32/dtobj')
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx4
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx16
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.hxx16
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx8
4 files changed, 22 insertions, 22 deletions
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 )
{