From 3e8bfde1e1dd859d4c09337605f92db24a142e44 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 29 Nov 2021 09:40:25 +0000 Subject: move PopupMenu::IsInExecute out of vcl/include/menu.hxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I01af38dd57a645ea0afeaff033ce6d07dfe09535 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126026 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- toolkit/source/awt/vclxmenu.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 02f693ef64a7..31c0f7f08edf 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -661,7 +662,7 @@ sal_Bool SAL_CALL VCLXMenu::isInExecute( ) ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( mpMenu && IsPopupMenu() ) - return PopupMenu::IsInExecute(); + return vcl::IsInPopupMenuExecute(); else return false; } -- cgit