diff options
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/sm.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_service.cxx | 6 |
5 files changed, 8 insertions, 8 deletions
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; |