diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-10 16:40:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-10 17:08:57 +0200 |
| commit | 60455c972b09ca02b18660c6fb3dafc03b30b2b5 (patch) | |
| tree | 58eec185446de910ad735862ff4393b1501f9c6b /vcl/aqua/source/dtrans/aqua_clipboard.cxx | |
| parent | f19b16e0b0aba67c355010271a81cfe5420fab93 (diff) | |
fdo#66718: Revert "fdo#46808, Adapt SystemClipboard UNO service to new style"
This reverts commit 2fe852386c9450014f84910b0a282d684f40b56a, see
<https://bugs.freedesktop.org/show_bug.cgi?id=66718#c8> for details. (On master
towards LO 4.2, this will be addressed differently, by modifying
2fe852386c9450014f84910b0a282d684f40b56a instead of reverting it, so this
libreoffice-4-1 commit is not a cherry-pick of any master commit.)
Conflicts:
dtrans/source/win32/clipb/WinClipboard.cxx
offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
offapi/type_reference/types.rdb
vcl/ios/source/dtrans/ios_clipboard.cxx
vcl/ios/source/dtrans/ios_clipboard.hxx
vcl/source/window/window.cxx
Change-Id: Idb804196bc5693e4e8674d805edefd9d1ae7c178
Diffstat (limited to 'vcl/aqua/source/dtrans/aqua_clipboard.cxx')
| -rw-r--r-- | vcl/aqua/source/dtrans/aqua_clipboard.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 383c7488aa2f..eaaf7e8f0698 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -81,7 +81,7 @@ Sequence<OUString> clipboard_getSupportedServiceNames() AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard) : - WeakComponentImplHelper3<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex), + WeakComponentImplHelper4<XClipboardEx, XClipboardNotifier, XFlushableClipboard, XServiceInfo>(m_aMutex), mIsSystemPasteboard(bUseSystemPasteboard) { Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); |