diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/menu.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 61957f56cd6f..c9e1152a2d8a 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -20,6 +20,7 @@ #include <tools/diagnose_ex.h> #include <tools/stream.hxx> +#include <comphelper/lok.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/image.hxx> @@ -40,6 +41,7 @@ #include <vcl/dockingarea.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/IDialogRenderable.hxx> #include <salinst.hxx> #include <svdata.hxx> @@ -2693,12 +2695,14 @@ MenuFloatingWindow * PopupMenu::ImplGetFloatingWindow() const { } PopupMenu::PopupMenu() + : mpLOKNotifier(nullptr) { mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this); } PopupMenu::PopupMenu( const PopupMenu& rMenu ) - : Menu() + : Menu(), + mpLOKNotifier(nullptr) { mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this); *this = rMenu; @@ -2899,6 +2903,9 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R } VclPtrInstance<MenuFloatingWindow> pWin( this, pW, WB_BORDER | WB_SYSTEMWINDOW ); + if (comphelper::LibreOfficeKit::isActive() && mpLOKNotifier) + pWin->SetLOKNotifier(mpLOKNotifier); + if( pSVData->maNWFData.mbFlatMenu ) pWin->SetBorderStyle( WindowBorderStyle::NOBORDER ); else |