Skip to content

C
core
Kaydet (Commit) 2fab32e8 authored tarafından Malte Timmermann's avatar Malte Timmermann
Dosyalara gözat
Seçenekler

mtclip01: #i112022# Allow extended clipboard creation

üst c5934ada
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
vcl/source/window/window.cxx
Dosyayı görüntüle @ 2fab32e8
...@@ -8641,7 +8641,10 @@ Reference< XClipboard > Window::GetClipboard() ...@@ -8641,7 +8641,10 @@ Reference< XClipboard > Window::GetClipboard()
if( xFactory.is() ) 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 defined(UNX) && !defined(QUARTZ) // unix clipboard needs to be initialized
if( mpWindowImpl->mpFrameData->mxClipboard.is() ) if( mpWindowImpl->mpFrameData->mxClipboard.is() )
...@@ -8703,6 +8706,9 @@ Reference< XClipboard > Window::GetPrimarySelection() ...@@ -8703,6 +8706,9 @@ Reference< XClipboard > Window::GetPrimarySelection()
# else # else
static Reference< XClipboard > s_xSelection; 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() ) if ( !s_xSelection.is() )
s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY ); s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment