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 --- sw/source/uibase/docvw/edtwin.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/source') diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 45139e673912..f6acd7d6360c 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -2769,7 +2770,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) SfxInPlaceClient* pIPClient = rSh.GetSfxViewShell()->GetIPClient(); bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); - if ( bIsOleActive && PopupMenu::IsInExecute() ) + if (bIsOleActive && vcl::IsInPopupMenuExecute()) return; MouseEvent aMEvt(_rMEvt); -- cgit v1.2.3