[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann]

 vcl/source/window/window.cxx |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 9579db98d87c13977bd3a907f3560d564d5d9302
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jul 10 16:17:46 2013 +0200

    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.

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 42e7af0..9ad12cf 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8481,19 +8481,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 );
             }