diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-15 21:02:49 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-16 13:07:58 +0000 |
| commit | 535f2b2b0a21407c4412d14149d271a199c3e6b8 (patch) | |
| tree | 934fbcebf62de9ace52d160f34ae018c99304058 /include | |
| parent | c5555c1698665011457147b1f15ea00f04665a05 (diff) | |
Convert RID_MENU_NOTEBOOKBAR to xml
Brings a lot of features (icons, keyboard shortcuts,
customization, context menu interception etc.)
Other changes:
- Make SfxDispatcher::ExecutePopup take PopupMenuFlags
arg, to be able to pass NoMouseUpClose, so that the
menu won't close on mouse-up under anything != gtk3.
- Make .uno:OpenFromWriter and .uno:OpenFromCalc async
slots, to avoid crash under gtk3 when recycling the
current frame.
- Don't show the menu in customization dialog, if
experimental mode disabled.
Change-Id: Ieea2f73f6b48fbaf4bdfc4acf1a33d25422357cb
Reviewed-on: https://gerrit.libreoffice.org/33101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/dispatch.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index ac675cc242b3..92d0b42cb3fb 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -25,6 +25,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/menu.hxx> #include <o3tl/typed_flags_set.hxx> #include <initializer_list> @@ -147,7 +148,8 @@ public: SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; - void ExecutePopup( const OUString &rResName, vcl::Window *pWin = nullptr, const Point *pPos = nullptr ); + void ExecutePopup( const OUString &rResName, vcl::Window *pWin = nullptr, const Point *pPos = nullptr, + PopupMenuFlags nFlags = PopupMenuFlags::ExecuteDown ); static void ExecutePopup( vcl::Window *pWin = nullptr, const Point *pPosPixel = nullptr ); bool IsAppDispatcher() const; |