diff options
| author | obo <obo@openoffice.org> | 2010-06-21 15:06:39 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-21 15:06:39 +0200 |
| commit | 9d48829ff370d49cfedddb88eade37aee36f4ba6 (patch) | |
| tree | c706833995659b3d439bf4f441b3e4d34490f5c7 /vcl/source/window/window.cxx | |
| parent | ca1e640c70f7953d31aa2676e1fadbe8f4e25cc4 (diff) | |
| parent | d0819ab0e6ce0c2eb9354831bbee84abd1bd30d6 (diff) | |
CWS-TOOLING: integrate CWS mtclip01
Diffstat (limited to 'vcl/source/window/window.cxx')
| -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 ca92d9ed6c5b..ebeb5c94d68a 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8650,7 +8650,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() ) @@ -8713,6 +8716,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; |