diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-02-28 15:03:12 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-03-05 12:18:11 +0100 |
| commit | c3751ed3c98e8ed40100a8073b97c83d9ded0803 (patch) | |
| tree | 4760d1f71ecab3f06a4f8dde4f09e2991de5b7be /vcl/qt5/Qt5Frame.cxx | |
| parent | 98b8fa299f7d7e68d42e322faf64cb0cd9923d95 (diff) | |
tdf#120783: take suggested/preferred DnD ops into account
use those for drag operation start in Qt5Widget and eventually
to construct DropTargetDragEnterEvent
Change-Id: I3a92cbe722dadc64f8a210f7fd4016c8eb17216b
Reviewed-on: https://gerrit.libreoffice.org/68675
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/qt5/Qt5Frame.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 81d47c98d39b..d6f0993d8bd9 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -1107,7 +1107,8 @@ void Qt5Frame::deregisterDropTarget(Qt5DropTarget const* pDropTarget) m_pDropTarget = nullptr; } -void Qt5Frame::draggingStarted(const int x, const int y, const QMimeData* pQMimeData) +void Qt5Frame::draggingStarted(const int x, const int y, Qt::DropActions eActions, + const QMimeData* pQMimeData) { assert(m_pDropTarget); @@ -1116,8 +1117,8 @@ void Qt5Frame::draggingStarted(const int x, const int y, const QMimeData* pQMime aEvent.Context = static_cast<css::datatransfer::dnd::XDropTargetDragContext*>(m_pDropTarget); aEvent.LocationX = x; aEvent.LocationY = y; - aEvent.DropAction = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; - aEvent.SourceActions = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; + aEvent.DropAction = getPreferredDropAction(eActions); + aEvent.SourceActions = toVclDropActions(eActions); css::uno::Reference<css::datatransfer::XTransferable> xTransferable; if (!pQMimeData->hasFormat(sInternalMimeType)) |