[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/content.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fd1a4fddad5932c514199de0f8a7b5a2f82ce437
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 7 11:06:51 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 7 15:20:43 2020 +0200

    tdf#132477 don't leave removed row highlighted
    
    so that an attempt is made to unhighlight it in dnd post-processing
    
    Change-Id: I23fdf407d53c22a6bfd697e5e23c450f009c67b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93629
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 87ae08cfcecb..44ce6c197a9e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1092,6 +1092,9 @@ sal_Int8 SwContentTree::ExecuteDrop(const ExecuteDropEvent& rEvt)
                 nTargetPos = GetWrtShell()->getIDocumentOutlineNodesAccess()->getOutlineNodesCount() - 1;
         }
 
+        // remove the drop highlight before we change the contents of the tree so we don't
+        // try and dereference a removed entry in post-processing drop
+        m_xTreeView->unset_drag_dest_row();
         MoveOutline(nTargetPos);
 
     }