From 3ac46abde192324fc7e1cbf3f22b7280f15e77df Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Fri, 30 Nov 2018 10:32:11 +0100 Subject: tdf#120781: Proposed DnD operation is not always 'move' sometimes drop target doesn't accept drops, dragged objects must not disappear in such case Change-Id: I5de3c6c4afc305ea98bd15c7ff55e218364e9475 Reviewed-on: https://gerrit.libreoffice.org/64338 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- vcl/inc/qt5/Qt5DragAndDrop.hxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vcl/inc') diff --git a/vcl/inc/qt5/Qt5DragAndDrop.hxx b/vcl/inc/qt5/Qt5DragAndDrop.hxx index 568b64236868..dc5b52678d0a 100644 --- a/vcl/inc/qt5/Qt5DragAndDrop.hxx +++ b/vcl/inc/qt5/Qt5DragAndDrop.hxx @@ -57,7 +57,7 @@ public: css::uno::Sequence SAL_CALL getSupportedServiceNames() override; void dragFailed(); - void fire_dragEnd(); + void fire_dragEnd(sal_Int8 nAction); css::uno::Reference const& GetTransferable() const { return m_xTrans; @@ -72,6 +72,8 @@ class Qt5DropTarget { osl::Mutex m_aMutex; Qt5Frame* m_pFrame; + sal_Int8 mnDragAction; + sal_Int8 mnDropAction; bool m_bActive; sal_Int8 m_nDefaultActions; std::vector> m_aListeners; @@ -111,6 +113,8 @@ public: void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtde); void fire_dragOver(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtde); void fire_drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde); + + sal_Int8 proposedDragAction() const { return mnDragAction; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit