diff options
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index eb0c3dcc9b03..d4b69b1a747b 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -35,6 +35,7 @@ #include <svtools/framestatuslistener.hxx> #include <svtools/valueset.hxx> #include <svtools/toolbarmenu.hxx> +#include <toolkit/awt/vclxwindow.hxx> #include "toolbarmenuimp.hxx" using namespace ::com::sun::star::uno; @@ -1486,6 +1487,7 @@ bool ToolbarPopup::IsInPopupMode() void ToolbarPopup::EndPopupMode() { + VclListenerLock aLock(this, /*bSystemWindow=*/true); GetDockingManager()->EndPopupMode(this); } diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 51f2b6e10f42..19276a45854f 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <toolkit/awt/vclxwindow.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> @@ -213,6 +214,8 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() pWin->EnableDocking(); mxImpl->SetPopupWindow(pWin,pToolBox); + + VclListenerLock aLock(pWin, /*bSystemWindow=*/true); vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, eFloatFlags ); } } |