diff options
| author | Hennes Rohling <hro@openoffice.org> | 2001-10-19 13:55:57 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2001-10-19 13:55:57 +0000 |
| commit | 98759b499552331d61225e232a0943c1b86f09a6 (patch) | |
| tree | 9ace6500653f015a45d42ea87ebbd09b53f1115e | |
| parent | f5f32f829ee864adeab89a9befdd3949fd64ef45 (diff) | |
#92637# Use generic clipboard service to emulate primary selection on Windows platforms
| -rw-r--r-- | vcl/source/window/window.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0569e66616ec..29a39a5b74e3 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2,9 +2,9 @@ * * $RCSfile: window.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: hr $ $Date: 2001-09-27 17:28:34 $ + * last change: $Author: hro $ $Date: 2001-10-19 14:55:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -6937,20 +6937,22 @@ Reference< XClipboard > Window::GetSelection() mpFrame->GetFrameInterface()->GetClipboardAndSelection( mpFrameData->mxClipboard, mpFrameData->mxSelection ); #else -#ifdef UNX // FIXME: primary selection only supported on unix yet Reference< XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() ); if( xFactory.is() ) { +# ifdef UNX Sequence< Any > aArgumentList( 2 ); aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() ); aArgumentList[ 1 ] = makeAny( OUString::createFromAscii( "PRIMARY" ) ); mpFrameData->mxSelection = Reference< XClipboard >( xFactory->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ), aArgumentList ), UNO_QUERY ); - +# else + mpFrameData->mxSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY ); +# endif } -#endif + #endif } |