[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Armin Le Grand]

 vcl/source/window/dockwin.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 371591344d5b3a8181de440b49bad0cf2f63fe2c
Author: Armin Le Grand <alg at apache.org>
Date:   Mon Dec 2 14:14:13 2013 +0000

    Resolves: #i123765# reset buffered DropTarget when undocking
    
    (cherry picked from commit 8d679227fafe9108c4dc6e8adff85a727e4ef3af)
    
    Change-Id: Ia6fba705d91157afea30693fa7078aabc96f02ac
    (cherry picked from commit 032a4f6b2d771dd4e1b4a1ceee7c3ef15ca356eb)

diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 966b6c3..273f634 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;