diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-08-30 14:37:15 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-09-02 16:54:56 +0200 |
commit | c7c209ddb55da8b8e49e1a37bb49816987d8e109 (patch) | |
tree | 034d63bfd8df2c8149d57f40247a8df224df5743 | |
parent | update credits (diff) | |
download | core-c7c209ddb55da8b8e49e1a37bb49816987d8e109.tar.gz core-c7c209ddb55da8b8e49e1a37bb49816987d8e109.zip |
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@posteo.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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); |