framework/source/uielement/menubarmanager.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit c9303b98ad69213fe346d0657a8bca5ac8fa3bd7 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Thu Dec 22 01:03:31 2016 +0200 tdf#104818 Show the right label when a11y enabled Change-Id: If4da5b9435e96e3830bac3d01e06f7ddc87754eb diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 530df3e..0a50c02 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1172,11 +1172,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() ) { @@ -1191,6 +1186,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; VclPtr<PopupMenu> pPopup = pMenu->GetPopupMenu( nItemId ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits