1 files changed, 5 insertions, 15 deletions
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 0c639cd60fa0..56c38019ab3b 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -981,15 +981,9 @@ void TransferableHelper::CopyToSelection(const Reference<XClipboard>& rSelection
     }
 }
 
-void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const
+void TransferableHelper::CopyToPrimarySelection() const
 {
-    DBG_ASSERT( pWindow, "Window pointer is NULL" );
-    Reference< XClipboard > xSelection;
-
-    if( pWindow )
-        xSelection = pWindow->GetPrimarySelection();
-
-    CopyToSelection(xSelection);
+    CopyToSelection(GetSystemPrimarySelection());
 }
 
 void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions )
@@ -1033,10 +1027,9 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct
     }
 }
 
-void TransferableHelper::ClearSelection( vcl::Window *pWindow )
+void TransferableHelper::ClearPrimarySelection()
 {
-    DBG_ASSERT( pWindow, "Window pointer is NULL" );
-    Reference< XClipboard > xSelection( pWindow->GetPrimarySelection() );
+    Reference< XClipboard > xSelection(GetSystemPrimarySelection());
 
     if( xSelection.is() )
         xSelection->setContents( nullptr, nullptr );
@@ -2182,12 +2175,9 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window*
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
 
-    Reference< XClipboard > xSelection;
+    Reference< XClipboard > xSelection(GetSystemPrimarySelection());
     TransferableDataHelper   aRet;
 
-    if( pWindow )
-        xSelection = pWindow->GetPrimarySelection();
-
     if( xSelection.is() )
        {
            SolarMutexReleaser aReleaser;