summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2016-10-03 11:03:06 -0400
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-04 07:33:22 +0000
commitae3ec79354f7b4967e736c6a4cd7c08fc52e2b7d (patch)
treedcf94ecd6fa3e3fd54c39ac392ece5ba8608bf5e
parentbd89dff26155800be457735a0252476b670ddbd2 (diff)
there’s no need to peel tildæ for separator
Change-Id: Id53e5c704759d831bedd42ca9a8cd9f393ecdd0c Reviewed-on: https://gerrit.libreoffice.org/29492 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--vcl/osx/salmenu.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 70a438a8294d..7c9b7dbdbc77 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -866,9 +866,6 @@ AquaSalMenuItem::AquaSalMenuItem( const SalItemParams* pItemData ) :
mpSubMenu( nullptr ),
mpMenuItem( nil )
{
- // Delete mnemonics
- OUString aText = pItemData->aText.replaceAll("~", "");
-
if (pItemData->eType == MenuItemType::SEPARATOR)
{
mpMenuItem = [NSMenuItem separatorItem];
@@ -880,7 +877,9 @@ AquaSalMenuItem::AquaSalMenuItem( const SalItemParams* pItemData ) :
{
mpMenuItem = [[SalNSMenuItem alloc] initWithMenuItem: this];
[mpMenuItem setEnabled: YES];
- NSString* pString = CreateNSString( aText );
+
+ // peel mnemonics because on mac there are no such things for menu items
+ NSString* pString = CreateNSString( pItemData->aText.replaceAll( "~", "" ) );
if (pString)
{
[mpMenuItem setTitle: pString];