summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-10 16:55:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-10 19:12:39 +0100
commit0e69b6bcc5baaf1f524e70c2bbb41836b597bbb4 (patch)
tree01fc93b142a2ca82af184a2f4094f1006a02d1b0
parenta97d67cd0bf0819d4559fa79d5fcbcd86222fe6a (diff)
so the global Application GetAutoMnemonic is always true, simplify
Change-Id: I6c23273bd02841f72b489535f8a546e561df94e8
-rw-r--r--accessibility/source/standard/vclxaccessiblemenuitem.cxx2
-rw-r--r--vcl/source/window/menu.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index a303782969a4..dcb14fb526f0 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -440,7 +440,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
if ( m_pParent )
{
// create auto mnemonics
- if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( m_pParent->GetMenuFlags() & MenuFlags::NoAutoMnemonics ) )
+ if (!(m_pParent->GetMenuFlags() & MenuFlags::NoAutoMnemonics))
m_pParent->CreateAutoMnemonics();
// activation key
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a457784d66bd..59597c5dfad7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2980,7 +2980,7 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl
ImplCallEventListeners(VCLEVENT_MENU_SUBMENUCHANGED, nPos);
}
}
- else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MenuFlags::NoAutoMnemonics ) )
+ else if (!(nMenuFlags & MenuFlags::NoAutoMnemonics))
{
CreateAutoMnemonics();
}