[Libreoffice-commits] core.git: avmedia/source canvas/source connectivity/source dtrans/source embedserv/source extensions/source fpicker/source sal/osl shell/source winaccessibility/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Fri Dec 15 13:50:53 UTC 2017
avmedia/source/win/winuno.cxx | 4 -
canvas/source/directx/dx_canvas.cxx | 2
canvas/source/directx/dx_spritecanvas.cxx | 2
connectivity/source/drivers/ado/ADriver.cxx | 2
connectivity/source/drivers/ado/Aservices.cxx | 2
connectivity/source/inc/ado/ADriver.hxx | 2
dtrans/source/generic/clipboardmanager.cxx | 4 -
dtrans/source/generic/clipboardmanager.hxx | 4 -
dtrans/source/generic/dtrans.cxx | 2
dtrans/source/generic/generic_clipboard.cxx | 4 -
dtrans/source/generic/generic_clipboard.hxx | 4 -
dtrans/source/win32/clipb/WinClipboard.cxx | 2
dtrans/source/win32/clipb/wcbentry.cxx | 4 -
dtrans/source/win32/dnd/dndentry.cxx | 6 +-
dtrans/source/win32/dtobj/DOTransferable.cxx | 4 -
dtrans/source/win32/dtobj/FmtFilter.cxx | 16 +++----
dtrans/source/win32/dtobj/FmtFilter.hxx | 16 +++----
dtrans/source/win32/dtobj/XTDataObject.cxx | 8 +--
dtrans/source/win32/ftransl/ftransl.cxx | 14 +++---
dtrans/source/win32/ftransl/ftranslentry.cxx | 4 -
dtrans/source/win32/misc/ImplHelper.cxx | 22 +++++-----
dtrans/source/win32/misc/ImplHelper.hxx | 22 +++++-----
embedserv/source/embed/register.cxx | 8 +--
extensions/source/ole/servprov.hxx | 8 +--
extensions/source/ole/servreg.cxx | 10 ++--
extensions/source/update/check/onlinecheck.cxx | 2
extensions/source/update/check/onlinecheck.hxx | 2
fpicker/source/win32/filepicker/FPentry.cxx | 6 +-
fpicker/source/win32/filepicker/FilterContainer.cxx | 2
fpicker/source/win32/filepicker/FilterContainer.hxx | 2
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 2
fpicker/source/win32/folderpicker/FolderPicker.cxx | 2
sal/osl/w32/file.cxx | 2
sal/osl/w32/file_dirvol.cxx | 14 +++---
sal/osl/w32/module.cxx | 4 -
sal/osl/w32/path_helper.cxx | 2
sal/osl/w32/path_helper.hxx | 2
sal/osl/w32/profile.cxx | 4 -
sal/osl/w32/security.cxx | 4 -
sal/osl/w32/thread.cxx | 2
sal/osl/w32/thread.hxx | 2
shell/source/backends/wininetbe/wininetbecdef.cxx | 4 -
shell/source/win32/SysShExec.cxx | 2
shell/source/win32/SysShentry.cxx | 4 -
shell/source/win32/simplemail/smplmailentry.cxx | 4 -
shell/source/win32/simplemail/smplmailsuppl.cxx | 2
winaccessibility/source/service/msaaservice_impl.cxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx | 2
50 files changed, 130 insertions(+), 130 deletions(-)
New commits:
commit c3250baa4a8029817f0d7fcaee8b9ffe169c6cb7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 15 10:21:55 2017 +0100
loplugin:salcall (clang-cl)
Change-Id: Idda630320bb5e02e1ea675b3b3786c9ec6ac166b
Reviewed-on: https://gerrit.libreoffice.org/46504
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 92d7af1a0f9f..d431fbf67830 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -26,12 +26,12 @@ using namespace ::com::sun::star;
// - factory methods -
-static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
{
return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = nullptr;
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index d1a58d9f92b8..03eb74bd8d6e 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -240,7 +240,7 @@ namespace dxcanvas
// The C shared lib entry points
extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* gdipluscanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxCanvasDecl, &dxcanvas::dxBitmapCanvasDecl} );
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 2cec275c7ffc..b7c191120a14 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -187,7 +187,7 @@ namespace dxcanvas
// The C shared lib entry points
extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* directx9canvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxSpriteCanvasDecl} );
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index eda24fef3855..d1217a6caa18 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -91,7 +91,7 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static( )
return aSNS;
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
{
return *(new ODriver(_rxFactory));
}
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 88c3e298e077..f31d14e326ae 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -73,7 +73,7 @@ struct ProviderRequest
};
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* ado_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 508a49307e6d..96f9f3ca213d 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -35,7 +35,7 @@ namespace connectivity
namespace ado
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+ css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver,
css::sdbcx::XDataDefinitionSupplier,
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
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index d4c7849b8337..461e831b6abf 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -32,20 +32,20 @@
using namespace ::com::sun::star;
/// @throws uno::Exception
-uno::Reference<uno::XInterface> SAL_CALL EmbedServer_createInstance(
+uno::Reference<uno::XInterface> EmbedServer_createInstance(
const uno::Reference<lang::XMultiServiceFactory> & xSMgr)
{
uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr );
return xService;
}
-OUString SAL_CALL EmbedServer_getImplementationName() throw()
+OUString EmbedServer_getImplementationName() throw()
{
return OUString("com.sun.star.comp.ole.EmbedServer");
}
-uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
+uno::Sequence< OUString > EmbedServer_getSupportedServiceNames() throw()
{
uno::Sequence<OUString> aServiceNames { "com.sun.star.document.OleEmbeddedServerRegistration" };
return aServiceNames;
@@ -53,7 +53,7 @@ uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw(
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL emser_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * emser_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 67dc9a71723d..b7f46f980fdf 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -34,13 +34,13 @@ using namespace std;
namespace ole_adapter
{
/// @throws Exception
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr);
+Reference< XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr);
/// @throws Exception
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr);
+Reference< XInterface> ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr);
/// @throws Exception
-Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
+Reference<XInterface> OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
/// @throws Exception
-Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
+Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
/*****************************************************************************
class declaration IClassFactoryWrapper
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 70dfe403338d..807bf990005b 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -29,32 +29,32 @@ using namespace cppu;
namespace ole_adapter
{
-Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr)
{
Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr);
return xService;
}
-Reference<XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> ConverterProvider_CreateInstanceVar1( const Reference<XMultiServiceFactory> & xSMgr)
{
Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr, UNO_OBJECT_WRAPPER_REMOTE_OPT, IUNKNOWN_WRAPPER_IMPL);
return xService;
}
-Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
{
Reference<XInterface> xService = *new OleClient_Impl( xSMgr);
return xService;
}
-Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
{
Reference<XInterface > xService = *new OleServer_Impl(xSMgr);
return xService;
}
} // end namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * oleautobridge_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx
index fd77299d11ef..4b8ac299c367 100644
--- a/extensions/source/update/check/onlinecheck.cxx
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -31,7 +31,7 @@
#include <wininet.h>
// #i71984
-extern "C" bool SAL_CALL WNT_hasInternetConnection()
+extern "C" bool WNT_hasInternetConnection()
{
DWORD dwFlags;
WCHAR szConnectionName[1024];
diff --git a/extensions/source/update/check/onlinecheck.hxx b/extensions/source/update/check/onlinecheck.hxx
index 731d3e6c2cbb..78d1bf4252d2 100644
--- a/extensions/source/update/check/onlinecheck.hxx
+++ b/extensions/source/update/check/onlinecheck.hxx
@@ -25,7 +25,7 @@
#include <sal/types.h>
#if defined(_WIN32)
-extern "C" bool SAL_CALL WNT_hasInternetConnection();
+extern "C" bool WNT_hasInternetConnection();
#endif
#endif
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index f5ce7ba45e12..311186fd355a 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::registry;
using namespace ::cppu;
using ::com::sun::star::ui::dialogs::XFilePicker2;
-static Reference< XInterface > SAL_CALL createInstance(
+static Reference< XInterface > createInstance(
const Reference< XMultiServiceFactory >& rServiceManager )
{
Reference< XInterface > xDlg;
@@ -50,7 +50,7 @@ static Reference< XInterface > SAL_CALL createInstance(
return xDlg;
}
-static Reference< XInterface > SAL_CALL
+static Reference< XInterface >
createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
{
return Reference< XInterface >( static_cast< cppu::OWeakObject * >( new CFolderPicker( rServiceManager ) ) );
@@ -59,7 +59,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory(
const sal_Char* pImplName, void* pSrvManager, void* )
{
void* pRet = nullptr;
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 07b9a9cea3ef..9545251d073f 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -235,7 +235,7 @@ void wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength
// format the Win32 API requires,
// e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
-OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
+OUString makeWinFilterBuffer( CFilterContainer& aFilterContainer )
{
// calculate the required buffer size
sal_uInt32 reqBuffSize = getTotalFilterLength( aFilterContainer );
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 450072fecf88..ffbe327f6463 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -102,7 +102,7 @@ private:
// the Win32 API requires, e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
-OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
+OUString makeWinFilterBuffer( CFilterContainer& aFilterContainer );
#endif
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 15aa1474ff5d..4584a1edd3b4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -54,7 +54,7 @@ namespace vista{
namespace
{
- css::uno::Sequence< OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
+ css::uno::Sequence< OUString > VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< OUString > aRet(2);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index c3b7b391f89a..ef74d8f182a7 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -39,7 +39,7 @@ using namespace com::sun::star::ui::dialogs;
namespace
{
- Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames()
+ Sequence< OUString > FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.ui.dialogs.SystemFolderPicker" };
return aRet;
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 158e58c54d40..1a08315742ba 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -659,7 +659,7 @@ oslFileError FileHandle_Impl::syncFile()
return result;
}
-extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(
+extern "C" oslFileHandle osl_createFileHandleFromOSHandle(
HANDLE hFile,
sal_uInt32 uFlags)
{
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 3ef290140a0a..d59932e315fc 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -490,7 +490,7 @@ static oslFileError osl_openLocalRoot(
return error;
}
-static oslFileError SAL_CALL osl_openFileDirectory(
+static oslFileError osl_openFileDirectory(
rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
{
oslFileError error = osl_File_E_None;
@@ -542,7 +542,7 @@ static oslFileError SAL_CALL osl_openFileDirectory(
return error;
}
-static oslFileError SAL_CALL osl_openNetworkServer(
+static oslFileError osl_openNetworkServer(
rtl_uString *strSysDirPath, oslDirectory *pDirectory)
{
NETRESOURCEW aNetResource;
@@ -757,7 +757,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect
return error;
}
-static oslFileError SAL_CALL osl_getNextNetResource(
+static oslFileError osl_getNextNetResource(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -802,7 +802,7 @@ static oslFileError SAL_CALL osl_getNextNetResource(
}
}
-static oslFileError SAL_CALL osl_getNextDrive(
+static oslFileError osl_getNextDrive(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -843,7 +843,7 @@ static oslFileError SAL_CALL osl_getNextDrive(
}
}
-static oslFileError SAL_CALL osl_getNextFileItem(
+static oslFileError osl_getNextFileItem(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/)
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -1434,7 +1434,7 @@ oslFileError SAL_CALL osl_getVolumeInformation(
return osl_File_E_None;
}
-static oslFileError SAL_CALL osl_getDriveInfo(
+static oslFileError osl_getDriveInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
{
DirectoryItem_Impl *pItemImpl = static_cast<DirectoryItem_Impl *>(Item);
@@ -1532,7 +1532,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
return osl_File_E_None;
}
-static oslFileError SAL_CALL osl_getServerInfo(
+static oslFileError osl_getServerInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
{
DirectoryItem_Impl *pItemImpl = static_cast<DirectoryItem_Impl *>(Item);
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 1a88d5cae888..943e215e206b 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -226,7 +226,7 @@ typedef BOOL (WINAPI *SymGetModuleInfo_PROC)(
BTW: We are using ANSI function because not all version of IMAGEHLP.DLL contain Unicode support
*/
-static bool SAL_CALL osl_addressGetModuleURL_NT4_( void *pv, rtl_uString **pustrURL )
+static bool osl_addressGetModuleURL_NT4_( void *pv, rtl_uString **pustrURL )
{
bool bSuccess = false; /* Assume failure */
@@ -329,7 +329,7 @@ typedef BOOL (WINAPI *GetModuleInformation_PROC)(
/* This version can fail because PSAPI.DLL is not always part of NT 4 despite MSDN Library 6.0a say so */
-static bool SAL_CALL osl_addressGetModuleURL_NT_( void *pv, rtl_uString **pustrURL )
+static bool osl_addressGetModuleURL_NT_( void *pv, rtl_uString **pustrURL )
{
bool bSuccess = false; /* Assume failure */
static HMODULE hModPsapi = nullptr;
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index c9fb14b00a94..53e0ae0b19a2 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -46,7 +46,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
"osl_systemPathEnsureSeparator: Post condition failed");
}
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
+void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
{
rtl::OUString path(*ppustrPath);
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 31c245ac868c..0210791f401f 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -42,7 +42,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
if the path is not the root path '\'
*/
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
+void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
/**
Returns whether a given path is only a logical drive pattern or not.
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index e9d573411d64..96dc7fcdbcec 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -155,7 +155,7 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*);
static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*);
static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_uString* ustrExtension);
-static bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
+static bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
{
@@ -754,7 +754,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
return n;
}
-bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
+bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
{
bool bFailed;
::osl::LongPathBuffer< sal_Unicode > aFile( MAX_LONG_PATH );
diff --git a/sal/osl/w32/security.cxx b/sal/osl/w32/security.cxx
index 77bce5d9bbbc..0c086cd5c7bf 100644
--- a/sal/osl/w32/security.cxx
+++ b/sal/osl/w32/security.cxx
@@ -70,7 +70,7 @@ static bool GetSpecialFolder(rtl_uString **strPath,int nFolder);
// We use LPCTSTR here, because we use it with SE_foo_NAME constants
// which are defined in winnt.h as UNICODE-dependent TEXT("PrivilegeName")
static BOOL Privilege(LPCTSTR pszPrivilege, BOOL bEnable);
-static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain);
+static bool getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain);
oslSecurity SAL_CALL osl_getCurrentSecurity(void)
{
@@ -747,7 +747,7 @@ static BOOL Privilege(LPCTSTR strPrivilege, BOOL bEnable)
return TRUE;
}
-static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain)
+static bool getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain)
{
if (Security != nullptr)
{
diff --git a/sal/osl/w32/thread.cxx b/sal/osl/w32/thread.cxx
index 1c2e9894956b..1e347dc3ebd5 100644
--- a/sal/osl/w32/thread.cxx
+++ b/sal/osl/w32/thread.cxx
@@ -425,7 +425,7 @@ static void RemoveKeyFromList( PTLS pTls )
}
}
-void SAL_CALL osl_callThreadKeyCallbackOnThreadDetach(void)
+void osl_callThreadKeyCallbackOnThreadDetach(void)
{
PTLS pTls;
diff --git a/sal/osl/w32/thread.hxx b/sal/osl/w32/thread.hxx
index 542c7b4da673..c7455aab8b0c 100644
--- a/sal/osl/w32/thread.hxx
+++ b/sal/osl/w32/thread.hxx
@@ -14,7 +14,7 @@
#include <sal/types.h>
-void SAL_CALL osl_callThreadKeyCallbackOnThreadDetach(void);
+void osl_callThreadKeyCallbackOnThreadDetach(void);
extern DWORD g_dwTLSTextEncodingIndex;
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 063dc1f47048..92bb5c8f65ce 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -27,7 +27,7 @@
namespace uno = com::sun::star::uno ;
-static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend(
+static uno::Reference<uno::XInterface> createWinInetBackend(
const uno::Reference<uno::XComponentContext>&){
return * WinInetBackend::createInstance();
@@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * wininetbe1_component_getFactory( const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 55b20e62fc46..a4e4d63e5a53 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -56,7 +56,7 @@ using namespace cppu;
namespace
{
- Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
+ Sequence< OUString > SysShExec_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.system.SystemShellExecute" };
return aRet;
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index 7a53c5436fef..a363edafdccf 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -33,7 +33,7 @@ using com::sun::star::system::XSystemShellExecute;
namespace
{
- Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext )
+ Reference< XInterface > createInstance( const Reference< XComponentContext >& xContext )
{
return Reference< XInterface >( static_cast< XSystemShellExecute* >( new CSysShExec(xContext) ) );
}
@@ -42,7 +42,7 @@ namespace
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory(
const sal_Char* pImplName, void*, void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 25aaeb1d5f75..685f29983b72 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -33,7 +33,7 @@ using com::sun::star::system::XSimpleMailClientSupplier;
namespace
{
- Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& )
+ Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& )
{
return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CSmplMailSuppl( ) ) );
}
@@ -42,7 +42,7 @@ namespace
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* smplmail_component_getFactory(
const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 22410f80216c..4e8aecc92a3d 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -34,7 +34,7 @@ using namespace cppu;
namespace
{
- Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
+ Sequence< OUString > Component_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.system.SimpleSystemMail" };
return aRet;
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 4028c5d8ae40..cc3b92116fdc 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -239,7 +239,7 @@ static void AccessBridgeUpdateOldTopWindows( const Reference< XMSAAService > &xA
* @param xContext No use here.
* @return The object interface.
*/
-Reference< XInterface > SAL_CALL create_MSAAServiceImpl( Reference< XComponentContext > const & /*xContext*/ )
+Reference< XInterface > create_MSAAServiceImpl( Reference< XComponentContext > const & /*xContext*/ )
{
Reference< XMSAAService > xAccMgr( new MSAAServiceImpl() );
@@ -298,7 +298,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL iacc2_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * iacc2_component_getFactory(
sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
registry::XRegistryKey * xRegistry )
{
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index ea73cd04fe81..41af74678a57 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -152,13 +152,13 @@ OUString SEInitializer_MSCryptImpl_getImplementationName()
return OUString( "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl" );
}
-cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames()
+cssu::Sequence< OUString > SEInitializer_MSCryptImpl_getSupportedServiceNames()
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.SEInitializer" };
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
+cssu::Reference< cssu::XInterface > SEInitializer_MSCryptImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new SEInitializer_MSCryptImpl( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index 05afb7bd0db8..dc80446404ee 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -73,11 +73,11 @@ public:
OUString SEInitializer_MSCryptImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SEInitializer_MSCryptImpl_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
#endif
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
index d5545f4f1990..e55569c7ef4f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-void* SAL_CALL mscrypt_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
+void* mscrypt_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
Reference< XSingleServiceFactory > xFactory ;
More information about the Libreoffice-commits
mailing list