summaryrefslogtreecommitdiffstats
path: root/vcl/source/window/dockmgr.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window/dockmgr.cxx')
-rw-r--r--vcl/source/window/dockmgr.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index c5d6a93798d4..34065088f137 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -809,6 +809,10 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
mpFloatWin->StartPopupMode( pParentToolBox, nFlags );
GetWindow()->Show();
+ DockingWindow* pDockWin = dynamic_cast< DockingWindow* >(mpDockingWindow.get());
+ if (pDockWin)
+ pDockWin->SetPopUpWindowLOKId(mpFloatWin->GetLOKWindowId());
+
if( pParentToolBox->IsKeyEvent() )
{
// send HOME key to subtoolbar in order to select first item
@@ -830,6 +834,10 @@ void ImplDockingWindowWrapper::StartPopupMode( const tools::Rectangle& rRect, Fl
IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void)
{
+ DockingWindow* pDockWin = dynamic_cast< DockingWindow* >(mpDockingWindow.get());
+ if (pDockWin)
+ pDockWin->SetPopUpWindowLOKId(0);
+
GetWindow()->Show( false, ShowFlags::NoFocusChange );
// set parameter for handler before destroying floating window