summaryrefslogtreecommitdiff
path: root/dtrans/source/win32
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-10 16:40:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-07-10 17:08:57 +0200
commit60455c972b09ca02b18660c6fb3dafc03b30b2b5 (patch)
tree58eec185446de910ad735862ff4393b1501f9c6b /dtrans/source/win32
parentf19b16e0b0aba67c355010271a81cfe5420fab93 (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 'dtrans/source/win32')
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.cxx2
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.hxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 5a2c1e9daac6..6f5874483830 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -59,7 +59,7 @@ namespace
//------------------------------------------------------------------------
/*XEventListener,*/
CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, const OUString& aClipboardName ) :
- WeakComponentImplHelper3< XSystemClipboard, XFlushableClipboard, XServiceInfo >( m_aCbListenerMutex ),
+ WeakComponentImplHelper4< XClipboardEx, XFlushableClipboard, XClipboardNotifier, XServiceInfo >( m_aCbListenerMutex ),
m_xContext( rxContext )
{
m_pImpl.reset( new CWinClipbImpl( aClipboardName, this ) );
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 608f9e9ceece..3b36ae7cd3e4 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -23,13 +23,12 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase4.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/clipboard/XFlushableClipboard.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -63,9 +62,10 @@ protected:
class CWinClipboard :
public CWinClipboardDummy,
- public cppu::WeakComponentImplHelper3<
- ::com::sun::star::datatransfer::clipboard::XSystemClipboard,
+ public cppu::WeakComponentImplHelper4<
+ ::com::sun::star::datatransfer::clipboard::XClipboardEx, \
::com::sun::star::datatransfer::clipboard::XFlushableClipboard,
+ ::com::sun::star::datatransfer::clipboard::XClipboardNotifier,
::com::sun::star::lang::XServiceInfo >
{
public: