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 /include | |
| 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 'include')
| -rw-r--r-- | include/vcl/dialoghelper.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/vcl/dialoghelper.hxx b/include/vcl/dialoghelper.hxx index 549188e00214..eedc6d37a5cf 100644 --- a/include/vcl/dialoghelper.hxx +++ b/include/vcl/dialoghelper.hxx @@ -18,9 +18,13 @@ class Window; extensions/source/activex/SOActiveX.cxx see extensions/source/activex/README.txt possibly dubious if this actually works as expected */ - VCL_DLLPUBLIC void EndAllDialogs(vcl::Window const* pParent); +/* returns true if a vcl PopupMenu is executing. Uses of this outside of vcl/toolkit + are possibly dubious. +*/ +VCL_DLLPUBLIC bool IsInPopupMenuExecute(); + /* for LibreOffice kit */ VCL_DLLPUBLIC void EnableDialogInput(vcl::Window* pDialog); VCL_DLLPUBLIC void CloseTopLevel(vcl::Window* pDialog); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index b0d7245cf72c..7fd2e34492bd 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -526,7 +526,6 @@ public: css::uno::Reference<css::awt::XPopupMenu> CreateMenuInterface(); - static bool IsInExecute(); static PopupMenu* GetActivePopupMenu(); PopupMenu& operator=( const PopupMenu& rMenu ); |