summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-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
14 files changed, 26 insertions, 26 deletions
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,
generated by cgit (git 2.34.1) at 2024-08-08 19:18:30 +0000