diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-12-22 01:03:31 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-01 17:40:50 +0000 |
| commit | 0690b64efac12eba37af78e66f8fff5e24c91c96 (patch) | |
| tree | f0d745340485bc1d082e2a07b7f25029aa155340 | |
| parent | 8c7dc41be3c19540a94fec45c310e19265df2539 (diff) | |
tdf#104818 Show the right label when a11y enabled
Change-Id: If4da5b9435e96e3830bac3d01e06f7ddc87754eb
(cherry picked from commit c9303b98ad69213fe346d0657a8bca5ac8fa3bd7)
Reviewed-on: https://gerrit.libreoffice.org/32377
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index daa0a455a40b..0c2be0aed5fc 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1176,11 +1176,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i ); - // Command can be just an alias to another command. - OUString aRealCommand = vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aItemCommand, m_xFrame ); - if ( !aRealCommand.isEmpty() ) - aItemCommand = aRealCommand; - // Set module identifier when provided from outside if ( !rModuleIdentifier.isEmpty() ) { @@ -1195,6 +1190,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pMenu->SetItemText( nItemId, RetrieveLabelFromCommand( aItemCommand )); } + // Command can be just an alias to another command. + OUString aRealCommand = vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aItemCommand, m_xFrame ); + if ( !aRealCommand.isEmpty() ) + aItemCommand = aRealCommand; + Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId ); |