diff options
author | Noel Grandin <noel@peralex.com> | 2013-01-14 16:05:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-01-15 09:56:01 +0200 |
commit | 2fe852386c9450014f84910b0a282d684f40b56a (patch) | |
tree | 88a39e3ad180a0266b881f71c3679fed769532fc /vcl/ios/source | |
parent | 54f141882400731e75d25ac137fa516d9093f4fc (diff) |
fdo#46808, Adapt SystemClipboard UNO service to new style
this is the datatransfer::clipboard::SystemClipboard service
Change-Id: I00227a2d84e2f1eaf9ca1ebb4fbe1f1548a6621d
Diffstat (limited to 'vcl/ios/source')
-rw-r--r-- | vcl/ios/source/dtrans/ios_clipboard.cxx | 2 | ||||
-rw-r--r-- | vcl/ios/source/dtrans/ios_clipboard.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/ios/source/dtrans/ios_clipboard.cxx b/vcl/ios/source/dtrans/ios_clipboard.cxx index 8b75fd7ebc2e..03c8c9c7e629 100644 --- a/vcl/ios/source/dtrans/ios_clipboard.cxx +++ b/vcl/ios/source/dtrans/ios_clipboard.cxx @@ -81,7 +81,7 @@ Sequence<OUString> clipboard_getSupportedServiceNames() IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard) : - WeakComponentImplHelper4<XClipboardEx, XClipboardNotifier, XFlushableClipboard, XServiceInfo>(m_aMutex), + WeakComponentImplHelper3<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex), mIsSystemPasteboard(bUseSystemPasteboard) { Reference<XMultiServiceFactory> mrServiceMgr = comphelper::getProcessServiceFactory(); diff --git a/vcl/ios/source/dtrans/ios_clipboard.hxx b/vcl/ios/source/dtrans/ios_clipboard.hxx index 1b67022a94ce..1c3dc40392af 100644 --- a/vcl/ios/source/dtrans/ios_clipboard.hxx +++ b/vcl/ios/source/dtrans/ios_clipboard.hxx @@ -22,12 +22,13 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase3.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> +#include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -62,8 +63,7 @@ class IosClipboard; class IosClipboard : public ::cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper4< com::sun::star::datatransfer::clipboard::XClipboardEx, - com::sun::star::datatransfer::clipboard::XClipboardNotifier, + public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::clipboard::XSystemClipboard, com::sun::star::datatransfer::clipboard::XFlushableClipboard, com::sun::star::lang::XServiceInfo >, private ::boost::noncopyable |