diff options
Diffstat (limited to 'dtrans/source/generic')
-rw-r--r-- | dtrans/source/generic/clipboardmanager.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/generic/clipboardmanager.hxx | 4 | ||||
-rw-r--r-- | dtrans/source/generic/dtrans.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/generic/generic_clipboard.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/generic/generic_clipboard.hxx | 4 |
5 files changed, 9 insertions, 9 deletions
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 |