[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 3247dce15d041d178fa2a855b53415a80df16a28
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 10 13:08:33 2017 +0100

    Resolves: tdf#107031 writer depends on ACTION_DEFAULT
    
    to do its standard "honor the DragDropMode setting" on
    drag and drop of outline headings into a document
    
    Change-Id: Ie154fb237de57ae18fa22d6f50dbf890fb9ebc77
    (cherry picked from commit 55e7f73640d754bf0004a0d8a989e0a20de00351)
    Reviewed-on: https://gerrit.libreoffice.org/36378
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 550e76e8cbe4..93a3d0138c8d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3394,6 +3394,14 @@ gboolean GtkSalFrame::signalDragDrop(GtkWidget* pWidget, GdkDragContext* context
     aEvent.LocationX = x;
     aEvent.LocationY = y;
     aEvent.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context));
+    // ACTION_DEFAULT is documented as...
+    // 'This means the user did not press any key during the Drag and Drop operation
+    // and the action that was combined with ACTION_DEFAULT is the system default action'
+    // in tdf#107031 writer won't insert a link when a heading is dragged from the
+    // navigator unless this is set. Its unclear really what ACTION_DEFAULT means,
+    // there is a deprecated 'GDK_ACTION_DEFAULT Means nothing, and should not be used'
+    // possible equivalent in gtk.
+    aEvent.DropAction |= css::datatransfer::dnd::DNDConstants::ACTION_DEFAULT;
     aEvent.SourceActions = GdkToVcl(gdk_drag_context_get_actions(context));
     css::uno::Reference<css::datatransfer::XTransferable> xTransferable;
     // For LibreOffice internal D&D we provide the Transferable without Gtk