diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-11-30 10:32:11 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-03 10:51:28 +0100 |
| commit | 3ac46abde192324fc7e1cbf3f22b7280f15e77df (patch) | |
| tree | b88d3c411b09c8fd6bf049b90ff38a38a8e5dd50 /vcl/inc | |
| parent | 097da565e03c8bf1fc016d5a797f4e606716a7a3 (diff) | |
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 <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/qt5/Qt5DragAndDrop.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
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<OUString> SAL_CALL getSupportedServiceNames() override; void dragFailed(); - void fire_dragEnd(); + void fire_dragEnd(sal_Int8 nAction); css::uno::Reference<css::datatransfer::XTransferable> 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<css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>> 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: */ |