summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-12-08 22:21:52 +0100
committerMichael Meeks <michael.meeks@collabora.com>2016-12-09 15:10:47 +0000
commit5d647341feac4ef2870923bde70ddcff33a24032 (patch)
treec02ce899fe6b206adaece6cf06d35e485d8956d2
parentf7a61c6c462ef188b82ade6c36d0c0bce1fe7f26 (diff)
tdf#104495: prevent autotext to crash when drag&drop
See bt https://bugs.documentfoundation.org/attachment.cgi?id=129407 For non regression, I retested tdf#91125 since the delete comes from https://cgit.freedesktop.org/libreoffice/core/commit/?id=06ecf7d2aebe64226142ee27c2512351960f8bb1 Change-Id: I7ce833ffce20f1f159242014ba8ffe0ce5b7b11c Reviewed-on: https://gerrit.libreoffice.org/31773 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 8776c20c1c72110d0f205150913eb17cdf3f1aaa) Reviewed-on: https://gerrit.libreoffice.org/31784 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 56261b0bb06e29b71e2cc555086100282e54d62e) Reviewed-on: https://gerrit.libreoffice.org/31793
-rw-r--r--svtools/source/contnr/treelistbox.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index b73d4df7aed1..6a53c7cd434b 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1230,7 +1230,6 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
{
nDragDropMode = nOldDragMode;
DragFinished( DND_ACTION_NONE );
- delete pContainer;
return;
}