diff options
| author | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-06-03 21:43:09 +0200 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-06-03 21:43:09 +0200 |
| commit | d0819ab0e6ce0c2eb9354831bbee84abd1bd30d6 (patch) | |
| tree | 6c9d560cc177a5261884a80620e7219e376694ae /vcl/source/window | |
| parent | d21adcdca61a7c54b3bf1584d80746dc0d2d1fc0 (diff) | |
| parent | 2fab32e831fc02e7efd4069aa0dfc7779d97a9cf (diff) | |
merged CWS...
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/window.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index b47aa50a2e72..4ffb52b0e2c9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8641,7 +8641,10 @@ Reference< XClipboard > Window::GetClipboard() if( xFactory.is() ) { - mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY ); + mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboardExt" ) ), UNO_QUERY ); + + if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) + mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY ); #if defined(UNX) && !defined(QUARTZ) // unix clipboard needs to be initialized if( mpWindowImpl->mpFrameData->mxClipboard.is() ) @@ -8704,6 +8707,9 @@ Reference< XClipboard > Window::GetPrimarySelection() static Reference< XClipboard > s_xSelection; if ( !s_xSelection.is() ) + s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboardExt" ) ), UNO_QUERY ); + + if ( !s_xSelection.is() ) s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY ); mpWindowImpl->mpFrameData->mxSelection = s_xSelection; |