diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-30 20:37:12 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-30 20:41:21 +0200 |
| commit | d59e33500a250824e713afacef2ea295576caba6 (patch) | |
| tree | 12f95f7e51253dd33767c89907109f0c6d6d0568 /include | |
| parent | 4badca074088b1f1a70b340d53fc464ec11e3d29 (diff) | |
fdo#62081 Improve split menu on style dropdown
* Remove "Apply style"
* Add "Update Style Based on Selection"
* A11y:
* Context menu key: Open submenu
* Return key: Apply style
Change-Id: Ib2960baa1412a05ea00b0e214d1af0a3d119e852
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/dialogs.hrc | 2 | ||||
| -rw-r--r-- | include/vcl/menubtn.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 65e8087944ce..d96bacb1a6dd 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -185,7 +185,7 @@ // for Toolbox-Control style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVX_STYLE_MENU (RID_SVX_START + 121) -#define RID_SVX_APPLY_STYLE (RID_SVX_START + 122) +#define RID_SVX_UPDATE_STYLE (RID_SVX_START + 122) #define RID_SVX_MODIFY_STYLE (RID_SVX_START + 123) #define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142) diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 78209c818d47..83087ab98318 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -45,7 +45,6 @@ private: Link maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); - SAL_DLLPRIVATE void ImplExecuteMenu(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); // Copy assignment is forbidden and not implemented. @@ -66,6 +65,8 @@ public: virtual void Activate() SAL_OVERRIDE; virtual void Select(); + void ExecuteMenu(); + void SetMenuMode( sal_uInt16 nMode ); sal_uInt16 GetMenuMode() const { return mnMenuMode; } |