Kaydet (Commit) 6a67ecd9 authored tarafından Katarina Behrens's avatar Katarina Behrens

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: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst f45f8d0c
...@@ -1111,6 +1111,7 @@ void Qt5Frame::registerDropTarget(Qt5DropTarget* pDropTarget) ...@@ -1111,6 +1111,7 @@ void Qt5Frame::registerDropTarget(Qt5DropTarget* pDropTarget)
{ {
assert(!m_pDropTarget); assert(!m_pDropTarget);
m_pDropTarget = pDropTarget; m_pDropTarget = pDropTarget;
m_pQWidget->setAcceptDrops(true);
} }
void Qt5Frame::deregisterDropTarget(Qt5DropTarget const* pDropTarget) void Qt5Frame::deregisterDropTarget(Qt5DropTarget const* pDropTarget)
......
...@@ -446,7 +446,6 @@ Qt5Widget::Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f) ...@@ -446,7 +446,6 @@ Qt5Widget::Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f)
{ {
create(); create();
setMouseTracking(true); setMouseTracking(true);
setAcceptDrops(true);
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment