diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index d218675f23aa..95f3f4a426ad 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -528,7 +528,7 @@ void Menu::InsertItem( const ResId& rResId ) } void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, - MenuItemBits nBits, const OString &rIdent) + MenuItemBits nBits) { OUString aLabel(CommandInfoProvider::Instance().GetPopupLabelForCommand(rCommand, rFrame)); OUString aTooltip(CommandInfoProvider::Instance().GetTooltipForCommand(rCommand, rFrame)); @@ -536,7 +536,7 @@ void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::f sal_uInt16 nItemId = GetItemCount() + 1; - InsertItem(nItemId, aLabel, aImage, nBits, rIdent); + InsertItem(nItemId, aLabel, aImage, nBits, OString()); SetItemCommand(nItemId, rCommand); SetHelpText(nItemId, aTooltip); } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index df0919243ad3..3037a581cc09 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4981,12 +4981,10 @@ void ToolBox::LoseFocus() } // performs the action associated with an item, ie simulates clicking the item -void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift ) +void ToolBox::TriggerItem( sal_uInt16 nItemId ) { mnHighItemId = nItemId; sal_uInt16 nModifier = 0; - if( bShift ) - nModifier |= KEY_SHIFT; vcl::KeyCode aKeyCode( 0, nModifier ); ImplActivateItem( aKeyCode ); } |