diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-10 16:17:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-10 17:08:57 +0200 |
| commit | f19b16e0b0aba67c355010271a81cfe5420fab93 (patch) | |
| tree | 1d9f48370f2b1823f6a67cfe90f9c945d5c7700b /vcl | |
| parent | 55be2ef39353de434600fac0611747177ab9da30 (diff) | |
Revert "fix for fdo#66718, access correct clipboard"
This reverts commit 942501b6e49c6c9e19556d9ec132a458e5fef6c3. As explained at
<https://bugs.freedesktop.org/show_bug.cgi?id=66718#c8>, a better fix is coming,
reverting 2fe852386c9450014f84910b0a282d684f40b56a "fdo#46808, Adapt
SystemClipboard UNO service to new style" completely for LO 4.1 again and re-
introducing it in simplified form for LO 4.2.
(cherry picked from commit 9579db98d87c13977bd3a907f3560d564d5d9302)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 2c31c790ce68..1018bb80efcd 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8435,19 +8435,11 @@ uno::Reference< XClipboard > Window::GetClipboard() try { uno::Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - Reference<XSystemClipboard> xSystemClipboard = SystemClipboard::createDefault(xContext); + Reference<XSystemClipboard> xSystemClipboard; #if defined(UNX) && !defined(MACOSX) // unix clipboard needs to be initialized - uno::Reference< XInitialization > xInit = uno::Reference< XInitialization >( xSystemClipboard, UNO_QUERY ); - - if( xInit.is() ) - { - Sequence< Any > aArgumentList( 3 ); - aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() ); - aArgumentList[ 1 ] = makeAny( OUString("CLIPBOARD") ); - aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() ); - - xInit->initialize( aArgumentList ); - } + xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), "CLIPBOARD", vcl::createBmpConverter() ); +#else + xSystemClipboard = SystemClipboard::createDefault(xContext); #endif mpWindowImpl->mpFrameData->mxClipboard.set( xSystemClipboard, UNO_QUERY ); } |