summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-12-02 14:14:13 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-02 16:51:09 +0000
commit371591344d5b3a8181de440b49bad0cf2f63fe2c (patch)
tree29ff5451fa7103e707ace06189a269aad8d872ed
parentea616972c06dec25b1baeb6b7d674c71c7af52fc (diff)
Resolves: #i123765# reset buffered DropTarget when undocking
(cherry picked from commit 8d679227fafe9108c4dc6e8adff85a727e4ef3af) Change-Id: Ia6fba705d91157afea30693fa7078aabc96f02ac (cherry picked from commit 032a4f6b2d771dd4e1b4a1ceee7c3ef15ca356eb)
-rw-r--r--vcl/source/window/dockwin.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 966b6c326143..273f6344cdfa 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -827,6 +827,11 @@ void DockingWindow::SetFloatingMode( sal_Bool bFloatMode )
// BorderWindow den Parent umsetzen
if ( mpOldBorderWin )
mpOldBorderWin->SetParent( pWin );
+
+ // #i123765# reset the buffered DropTargets when undocking, else it may not
+ // be correctly initialized
+ mpWindowImpl->mxDNDListenerContainer.clear();
+
SetParent( pWin );
SetPosPixel( Point() );
mpWindowImpl->mpBorderWindow = pWin;