[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmaddressblockpage.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c7c209ddb55da8b8e49e1a37bb49816987d8e109
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 30 14:37:15 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Sep 2 16:54:56 2021 +0200

    tdf#144105 crash after closing edit address block dialog
    
    use RemoveView to call RemoveDragAndDropListeners before shutdown to
    avoid RemoveDragAndDropListeners getting called during dtor and
    calling EditViewCallbacks::GetDropTarget on the destroyed host
    widget controller
    
    Change-Id: I63841b893d37d45cc44a0ffbaa534cf87c407615
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121278
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e62f18352f1c..65bdcfbc4030 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1068,6 +1068,7 @@ void AddressMultiLineEdit::EndDropTarget()
 {
     if (m_xDropTarget.is())
     {
+        m_xEditEngine->RemoveView(m_xEditView.get());
         auto xRealDropTarget = GetDrawingArea()->get_drop_target();
         uno::Reference<css::datatransfer::dnd::XDropTargetListener> xListener(m_xDropTarget, uno::UNO_QUERY);
         xRealDropTarget->removeDropTargetListener(xListener);