framework/source/uielement/menubarmanager.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0690b64efac12eba37af78e66f8fff5e24c91c96
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
(cherry picked from commit c9303b98ad69213fe346d0657a8bca5ac8fa3bd7)
Reviewed-on: https://gerrit.libreoffice.org/32377
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index daa0a45..0c2be0a 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
