diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-11-29 09:40:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-29 17:24:40 +0100 |
| commit | 3e8bfde1e1dd859d4c09337605f92db24a142e44 (patch) | |
| tree | e58a976c31395c08757a16f0fa561114622ce32f /sw | |
| parent | 774c6a6e1603bf3f12f1573b0778e0f0f9783169 (diff) | |
move PopupMenu::IsInExecute out of vcl/include/menu.hxx
Change-Id: I01af38dd57a645ea0afeaff033ce6d07dfe09535
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126026
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/ui/ContextMenuExecuteEvent.hpp> +#include <vcl/dialoghelper.hxx> #include <vcl/inputctx.hxx> #include <vcl/help.hxx> #include <vcl/weld.hxx> @@ -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); |