diff options
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/session.cxx | 6 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 4 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 4 |
3 files changed, 7 insertions, 7 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); |