summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/factory.hxx28
-rw-r--r--vcl/source/app/session.cxx6
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/app/svmain.cxx4
-rw-r--r--vcl/source/bitmap/checksum.cxx2
-rw-r--r--vcl/source/components/dtranscomp.cxx16
-rw-r--r--vcl/source/components/factory.cxx2
-rw-r--r--vcl/source/components/fontident.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx2
-rw-r--r--vcl/source/gdi/bitmap4.cxx2
-rw-r--r--vcl/source/gdi/impvect.cxx2
-rw-r--r--vcl/source/outdev/hatch.cxx2
-rw-r--r--vcl/source/uitest/uno/uitest_uno.cxx2
-rw-r--r--vcl/source/window/abstdlg.cxx4
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/unx/generic/app/salinst.cxx2
-rw-r--r--vcl/unx/generic/app/sm.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx6
-rw-r--r--vcl/workben/fftester.cxx2
21 files changed, 49 insertions, 49 deletions
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index d33bb2c371ed..55203844d1bb 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -35,41 +35,41 @@ namespace com { namespace sun { namespace star {
namespace uno { class XInterface; }
} } }
-css::uno::Sequence<OUString> SAL_CALL vcl_session_getSupportedServiceNames();
+css::uno::Sequence<OUString> vcl_session_getSupportedServiceNames();
-OUString SAL_CALL vcl_session_getImplementationName();
+OUString vcl_session_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL vcl_session_createInstance(
+css::uno::Reference<css::uno::XInterface> vcl_session_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory > const &);
namespace vcl {
-css::uno::Sequence<OUString> SAL_CALL
+css::uno::Sequence<OUString>
FontIdentificator_getSupportedServiceNames();
-OUString SAL_CALL FontIdentificator_getImplementationName();
+OUString FontIdentificator_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface>
FontIdentificator_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory > const &);
-OUString SAL_CALL Clipboard_getImplementationName();
+OUString Clipboard_getImplementationName();
-css::uno::Reference<css::lang::XSingleServiceFactory> SAL_CALL
+css::uno::Reference<css::lang::XSingleServiceFactory>
Clipboard_createFactory();
-css::uno::Sequence<OUString> SAL_CALL DragSource_getSupportedServiceNames();
+css::uno::Sequence<OUString> DragSource_getSupportedServiceNames();
-OUString SAL_CALL DragSource_getImplementationName();
+OUString DragSource_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL DragSource_createInstance(
+css::uno::Reference<css::uno::XInterface> DragSource_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory > const &);
-css::uno::Sequence<OUString> SAL_CALL DropTarget_getSupportedServiceNames();
+css::uno::Sequence<OUString> DropTarget_getSupportedServiceNames();
-OUString SAL_CALL DropTarget_getImplementationName();
+OUString DropTarget_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL DropTarget_createInstance(
+css::uno::Reference<css::uno::XInterface> DropTarget_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory > const &);
}
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 0969f33eadab..35ec2f8cdb83 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -383,14 +383,14 @@ void VCLSession::disposing() {
// service implementation
-OUString SAL_CALL vcl_session_getImplementationName()
+OUString vcl_session_getImplementationName()
{
SAL_INFO("vcl.se", "vcl_session_getImplementationName");
return OUString( "com.sun.star.frame.VCLSessionManagerClient" );
}
-Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames()
+Sequence< OUString > vcl_session_getSupportedServiceNames()
{
SAL_INFO("vcl.se", "vcl_session_getSupportedServiceNames");
@@ -398,7 +398,7 @@ Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames()
return aRet;
}
-css::uno::Reference< XInterface > SAL_CALL vcl_session_createInstance( SAL_UNUSED_PARAMETER const css::uno::Reference< XMultiServiceFactory > & )
+css::uno::Reference< XInterface > vcl_session_createInstance( SAL_UNUSED_PARAMETER const css::uno::Reference< XMultiServiceFactory > & )
{
SAL_INFO("vcl.se", "vcl_session_createInstance");
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index f9e82ccd2acb..087710450d2d 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -151,7 +151,7 @@ namespace
}
extern "C" {
- typedef UnoWrapperBase* (SAL_CALL *FN_TkCreateUnoWrapper)();
+ typedef UnoWrapperBase* (*FN_TkCreateUnoWrapper)();
}
struct ImplPostEventData
@@ -1422,7 +1422,7 @@ extern "C" { UnoWrapperBase* CreateUnoWrapper(); }
#else
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index e4b1468eecec..528e797c1abc 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -111,7 +111,7 @@ static bool g_bIsLeanException;
static bool isInitVCL();
-oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo)
+oslSignalAction VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo)
{
static volatile bool bIn = false;
@@ -655,7 +655,7 @@ static unsigned __stdcall threadmain( void *pArgs )
static oslThread hThreadID = nullptr;
extern "C"
{
-static void SAL_CALL MainWorkerFunction( void* pArgs )
+static void MainWorkerFunction( void* pArgs )
{
static_cast<WorkerThreadData*>(pArgs)->pWorker( static_cast<WorkerThreadData*>(pArgs)->pThreadData );
delete static_cast<WorkerThreadData*>(pArgs);
diff --git a/vcl/source/bitmap/checksum.cxx b/vcl/source/bitmap/checksum.cxx
index 3c9a8a6f1656..d33d884033f9 100644
--- a/vcl/source/bitmap/checksum.cxx
+++ b/vcl/source/bitmap/checksum.cxx
@@ -126,7 +126,7 @@ static const sal_uInt64 vcl_crc64Table[256] = {
/*
* vcl_crc64.
*/
-sal_uInt64 SAL_CALL vcl_crc64 (
+sal_uInt64 vcl_crc64 (
sal_uInt64 Crc,
const void *Data, sal_uInt32 DatLen) SAL_THROW_EXTERN_C()
{
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 46ca921d3def..dd1bf719ffa6 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -215,7 +215,7 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq
return xResult;
}
-OUString SAL_CALL Clipboard_getImplementationName()
+OUString Clipboard_getImplementationName()
{
return OUString(
#if defined MACOSX
@@ -230,7 +230,7 @@ OUString SAL_CALL Clipboard_getImplementationName()
);
}
-Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory()
+Reference< XSingleServiceFactory > Clipboard_createFactory()
{
return Reference< XSingleServiceFactory >( new ClipboardFactory() );
}
@@ -303,7 +303,7 @@ void GenericDragSource::initialize( const Sequence< Any >& )
{
}
-Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
+Sequence< OUString > DragSource_getSupportedServiceNames()
{
#if defined MACOSX
return { "com.sun.star.datatransfer.dnd.OleDragSource" };
@@ -314,7 +314,7 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
#endif
}
-OUString SAL_CALL DragSource_getImplementationName()
+OUString DragSource_getImplementationName()
{
#if defined MACOSX
return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1");
@@ -325,7 +325,7 @@ OUString SAL_CALL DragSource_getImplementationName()
#endif
}
-Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > DragSource_createInstance( const Reference< XMultiServiceFactory >& )
{
SolarMutexGuard aGuard;
Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDragSource();
@@ -404,7 +404,7 @@ void GenericDropTarget::setDefaultActions( sal_Int8)
{
}
-Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
+Sequence< OUString > DropTarget_getSupportedServiceNames()
{
#if defined MACOSX
return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDropTarget" };
@@ -415,7 +415,7 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
#endif
}
-OUString SAL_CALL DropTarget_getImplementationName()
+OUString DropTarget_getImplementationName()
{
return OUString(
#if defined MACOSX
@@ -428,7 +428,7 @@ OUString SAL_CALL DropTarget_getImplementationName()
);
}
-Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > DropTarget_createInstance( const Reference< XMultiServiceFactory >& )
{
SolarMutexGuard aGuard;
Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDropTarget();
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 27f701f721f9..51b256d0cc1a 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star::lang;
extern "C" {
- VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory(
+ VCL_DLLPUBLIC void* vcl_component_getFactory(
const sal_Char* pImplementationName,
void* pXUnoSMgr,
void* /*pXUnoKey*/
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index ac3168160657..58226634a477 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -157,7 +157,7 @@ OUString FontIdentificator_getImplementationName()
return OUString( "vcl::FontIdentificator" );
}
-Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& )
{
return static_cast< ::cppu::OWeakObject * >( new FontIdentificator );
}
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 7873c3dde40f..668bf5f23f29 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1596,7 +1596,7 @@ struct PopularColorCount
sal_uInt32 mnCount;
};
-extern "C" int SAL_CALL ImplPopularCmpFnc( const void* p1, const void* p2 )
+extern "C" int ImplPopularCmpFnc( const void* p1, const void* p2 )
{
int nRet;
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index d5e995770993..554485de13dd 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -967,7 +967,7 @@ struct PopArtEntry
sal_uInt32 mnCount;
};
-extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
+extern "C" int ImplPopArtCmpFnc( const void* p1, const void* p2 )
{
int nRet;
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index e8fe30b7e5b0..d172aeae2418 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -99,7 +99,7 @@ struct ImplColorSet
bool mbSet;
};
-extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 )
+extern "C" int ImplColorSetCmpFnc( const void* p1, const void* p2 )
{
ImplColorSet const * pSet1 = static_cast<ImplColorSet const *>(p1);
ImplColorSet const * pSet2 = static_cast<ImplColorSet const *>(p2);
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index e84ec3a2874b..46edae35f790 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -35,7 +35,7 @@
#define HATCH_MAXPOINTS 1024
-extern "C" int SAL_CALL HatchCmpFnc( const void* p1, const void* p2 )
+extern "C" int HatchCmpFnc( const void* p1, const void* p2 )
{
const long nX1 = static_cast<Point const *>(p1)->X();
const long nX2 = static_cast<Point const *>(p2)->X();
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 9486ff752b97..a625e670667e 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -102,7 +102,7 @@ css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames()
return aServiceNames;
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
UITest_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new UITestUnoObj());
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 807e75ead2d0..aa2c971b5bbd 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -24,10 +24,10 @@
#include <vcl/abstdlg.hxx>
#include <vcl/bitmap.hxx>
-typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)();
+typedef VclAbstractDialogFactory* (*FuncPtrCreateDialogFactory)();
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#else
extern "C" VclAbstractDialogFactory* CreateDialogFactory();
#endif
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index da1e806d3a4d..624e15f76ab4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1127,7 +1127,7 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Wind
}
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &name, const OString &id,
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 7771a898edc9..c2d6197c38c8 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -207,7 +207,7 @@ void X11SalInstance::AfterAppInit()
pSalDisplay->SetupInput();
}
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService)
{
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index afe20eaba31f..b38126ad14ae 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -112,7 +112,7 @@ extern "C" void ICEWatchProc(
IceConn ice_conn, IcePointer client_data, Bool opening,
IcePointer * watch_data);
-extern "C" void SAL_CALL ICEConnectionWorker(void * data);
+extern "C" void ICEConnectionWorker(void * data);
class ICEConnectionObserver
{
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index a54a87f4ccd4..2f4e55b74773 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -105,7 +105,7 @@ namespace x11 {
virtual css::uno::Reference< css::uno::XInterface > getReference() throw() override;
};
- css::uno::Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
+ css::uno::Sequence< OUString > X11Clipboard_getSupportedServiceNames();
css::uno::Reference< css::uno::XInterface > SAL_CALL X11Clipboard_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 40b81f414902..de6e631ab9cc 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -485,11 +485,11 @@ namespace x11 {
virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override;
};
- css::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames();
+ css::uno::Sequence< OUString > Xdnd_getSupportedServiceNames();
css::uno::Reference< css::uno::XInterface > SAL_CALL Xdnd_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
- css::uno::Sequence< OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames();
+ css::uno::Sequence< OUString > Xdnd_dropTarget_getSupportedServiceNames();
css::uno::Reference< css::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 52c4a6573fcf..5c1f451f8d49 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -35,19 +35,19 @@ using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::awt;
using namespace x11;
-Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames()
+Sequence< OUString > x11::X11Clipboard_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
return aRet;
}
-Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames()
+Sequence< OUString > x11::Xdnd_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DragSource" };
return aRet;
}
-Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
+Sequence< OUString > x11::Xdnd_dropTarget_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DropTarget" };
return aRet;
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 3dd2fdb014f6..8957a89480cb 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang;
using namespace cppu;
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
typedef bool (*FFilterCall)(SvStream &rStream);
generated by cgit (git 2.34.1) at 2024-08-08 19:18:26 +0000