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/unx | |
| 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/unx')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.hxx | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index d0b2a7389714..dee55c4b47c1 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -47,11 +47,9 @@ using namespace x11; using ::rtl::OUString; X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : - ::cppu::WeakComponentImplHelper4< - ::com::sun::star::datatransfer::clipboard::XClipboardEx, - ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization + ::cppu::WeakComponentImplHelper2< + ::com::sun::star::datatransfer::clipboard::XSystemClipboard, + ::com::sun::star::lang::XServiceInfo >( rManager.getMutex() ), m_rSelectionManager( rManager ), diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 05b6b5a46cfb..19f56e842780 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -23,9 +23,9 @@ #include <X11_selection.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> - #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#include <cppuhelper/compbase4.hxx> +#include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> +#include <cppuhelper/compbase2.hxx> // ------------------------------------------------------------------------ @@ -34,11 +34,9 @@ namespace x11 { class X11Clipboard : - public ::cppu::WeakComponentImplHelper4 < - ::com::sun::star::datatransfer::clipboard::XClipboardEx, - ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization + public ::cppu::WeakComponentImplHelper2 < + ::com::sun::star::datatransfer::clipboard::XSystemClipboard, + ::com::sun::star::lang::XServiceInfo >, public SelectionAdaptor { |