diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-06-18 11:53:02 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-18 16:05:42 +0200 |
commit | 573138efec7fa28a98ba3b0301f6e0a97dac7978 (patch) | |
tree | 7559a661e13e2f3f99a0d9dc8e0a182e31cc5d3e /sw | |
parent | 0380917ad3e0054039f9a996cfcc025d93c28dc3 (diff) |
distinguish active dnd-operation case from simple query case
Change-Id: I1d8e95e46b45c71c0c83316ab4f19ba85eddcf75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96598
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index cf8959e687a8..3e1f7bab5d39 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -987,7 +987,7 @@ sal_Int8 SwContentTreeDropTarget::AcceptDrop(const AcceptDropEvent& rEvt) { // to enable the autoscroll when we're close to the edges weld::TreeView& rWidget = m_rTreeView.get_widget(); - rWidget.get_dest_row_at_pos(rEvt.maPosPixel, nullptr); + rWidget.get_dest_row_at_pos(rEvt.maPosPixel, nullptr, true); } return nAccept; @@ -1034,7 +1034,7 @@ sal_Int8 SwContentTreeDropTarget::ExecuteDrop(const ExecuteDropEvent& rEvt) sal_Int8 SwContentTree::ExecuteDrop(const ExecuteDropEvent& rEvt) { std::unique_ptr<weld::TreeIter> xDropEntry(m_xTreeView->make_iterator()); - if (!m_xTreeView->get_dest_row_at_pos(rEvt.maPosPixel, xDropEntry.get())) + if (!m_xTreeView->get_dest_row_at_pos(rEvt.maPosPixel, xDropEntry.get(), true)) xDropEntry.reset(); if (m_nRootType == ContentTypeId::OUTLINE) diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 3261050f3a6c..e1d640caa3f9 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -170,7 +170,7 @@ sal_Int8 SwGlobalTreeDropTarget::ExecuteDrop( const ExecuteDropEvent& rEvt ) weld::TreeView& rWidget = m_rTreeView.get_widget(); std::unique_ptr<weld::TreeIter> xDropEntry(rWidget.make_iterator()); - if (!rWidget.get_dest_row_at_pos(rEvt.maPosPixel, xDropEntry.get())) + if (!rWidget.get_dest_row_at_pos(rEvt.maPosPixel, xDropEntry.get(), true)) xDropEntry.reset(); if (rWidget.get_drag_source() == &rWidget) // internal drag @@ -234,7 +234,7 @@ sal_Int8 SwGlobalTreeDropTarget::AcceptDrop( const AcceptDropEvent& rEvt ) { // to enable the autoscroll when we're close to the edges weld::TreeView& rWidget = m_rTreeView.get_widget(); - rWidget.get_dest_row_at_pos(rEvt.maPosPixel, nullptr); + rWidget.get_dest_row_at_pos(rEvt.maPosPixel, nullptr, true); sal_Int8 nRet = rEvt.mnAction; |