diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-26 12:17:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-28 16:16:24 +0100 |
commit | 5325ce6a3c791bd4a5ee6e71f95a403562ca811c (patch) | |
tree | 6ba582c0887875ceb039b617d1b9344801b2c69c /reportdesign/source | |
parent | 6a3e04abd653cb86550b911b62ca54e2942f957a (diff) |
weld calc navigator
note: non-standard dnd via parent so the treeview triggers the dnd but doesn't
itself strictly speaking drive the dnd, see copying a range from the navigator
where the calc main edit window shows the outline where the copy of the range
from the calc main window will go
Change-Id: Ideecbe779e3d9bb5b392357a93ec25f625180ba8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89597
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 3 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/AddField.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 341430cde531..895ea2b9ed77 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -55,8 +55,9 @@ using namespace lang; using namespace container; using namespace ::svx; -IMPL_LINK_NOARG(OAddFieldWindow, DragBeginHdl, weld::TreeView&, bool) +IMPL_LINK(OAddFieldWindow, DragBeginHdl, bool&, rUnsetDragIcon, bool) { + rUnsetDragIcon = false; if (m_xListBox->get_selected_index() == -1) { // no drag without a field diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index a15c8091f13b..b348fcd32916 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -68,7 +68,7 @@ class OAddFieldWindow : public weld::GenericDialogController DECL_LINK( OnDoubleClickHdl, weld::TreeView&, bool ); DECL_LINK( OnSelectHdl, weld::TreeView&, void ); - DECL_LINK( DragBeginHdl, weld::TreeView&, bool ); + DECL_LINK( DragBeginHdl, bool&, bool ); DECL_LINK( OnSortAction, const OString&, void ); DECL_LINK( FocusChangeHdl, weld::Widget&, void ); |