xlastovi: #i91990# use generic service implementations for clipboard, drag and drop in headless case

2 files changed, 12 insertions, 6 deletions

diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 16308951bcfe..222b5cf40e04 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.cxx
@@ -34,6 +34,7 @@
 #include "DropTarget.hxx"
 #include "aqua_clipboard.hxx"
 #include "osl/diagnose.h"
+#include "vcl/svapp.hxx"
 
 using namespace ::osl;
 using namespace ::rtl;
@@ -45,6 +46,9 @@ using namespace ::com::sun::star::datatransfer::clipboard;
 
 Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< Any >& i_rArguments )
 {
+    if ( Application::IsHeadlessModeEnabled() )
+        return SalInstance::CreateClipboard( i_rArguments );
+
     SalData* pSalData = GetSalData();
     if( ! pSalData->mxClipboard.is() )
         pSalData->mxClipboard = Reference<XInterface>(static_cast< XClipboard* >(new AquaClipboard()), UNO_QUERY);
@@ -54,11 +58,17 @@ Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< Any >&
 
 Reference<XInterface> AquaSalInstance::CreateDragSource()
 {
+    if ( Application::IsHeadlessModeEnabled() )
+        return SalInstance::CreateDragSource();
+
     return Reference<XInterface>(static_cast< XInitialization* >(new DragSource()), UNO_QUERY);
 }
 
 Reference<XInterface> AquaSalInstance::CreateDropTarget()
 {
-  return Reference<XInterface>(static_cast< XInitialization* >(new DropTarget()), UNO_QUERY);
+    if ( Application::IsHeadlessModeEnabled() )
+        return SalInstance::CreateDropTarget();
+
+    return Reference<XInterface>(static_cast< XInitialization* >(new DropTarget()), UNO_QUERY);
 }
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4afd0c95a3a2..f6bedc1bfa25 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8521,10 +8521,6 @@ Reference< XDragSource > Window::GetDragSource()
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 
-    // #i91990#
-    if ( Application::IsHeadlessModeEnabled() )
-        return Reference< XDragSource > ();
-
     if( mpWindowImpl->mpFrameData )
     {
         if( ! mpWindowImpl->mpFrameData->mxDragSource.is() )
@@ -8619,7 +8615,7 @@ Reference< XClipboard > Window::GetClipboard()
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 
-    if( mpWindowImpl->mpFrameData && ! Application::IsHeadlessModeEnabled() )
+    if( mpWindowImpl->mpFrameData )
     {
         if( ! mpWindowImpl->mpFrameData->mxClipboard.is() )
         {