[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5

[Katarina Behrens (via logerrit)]

 vcl/qt5/Qt5Frame.cxx  |    1 +
 vcl/qt5/Qt5Widget.cxx |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69582a4afcc2d8f0da602d319b5785609c0292ad
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Mon Apr 29 15:42:40 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Apr 30 23:44:25 2019 +0200

    tdf#123859: only accept drops when drop target was registered
    
    some hard to reliably reproduce crashes when drag'n'dropping slides
    in slide sorter in Impress can be tracked down to null drop target.
    Not every SalFrame is registered as drop target, so let's accept
    drops (QWidget::setAcceptDrops) only for those frames that are.
    
    Change-Id: I01f006d619209c558e8d9976116daad65f51d7d9
    Reviewed-on: https://gerrit.libreoffice.org/71533
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 6a67ecd9b12e68031b5dbacb591955b59f476b86)
    Reviewed-on: https://gerrit.libreoffice.org/71583
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index b1ad0f93d561..62d3808ba572 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1100,6 +1100,7 @@ void Qt5Frame::registerDropTarget(Qt5DropTarget* pDropTarget)
 {
     assert(!m_pDropTarget);
     m_pDropTarget = pDropTarget;
+    m_pQWidget->setAcceptDrops(true);
 }
 
 void Qt5Frame::deregisterDropTarget(Qt5DropTarget const* pDropTarget)
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 8f7cb8756c25..62fae3736247 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -445,7 +445,6 @@ Qt5Widget::Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f)
 {
     create();
     setMouseTracking(true);
-    setAcceptDrops(true);
     setFocusPolicy(Qt::StrongFocus);
 }