[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

[Maxim Monastirsky]

 vcl/source/control/edit.cxx |    2 ++
 vcl/uiconfig/ui/editmenu.ui |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3df6b510a6dfeb940a799aaefa9a5f550b384667
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Apr 29 01:00:54 2018 +0300

    Edit context menu should follow shortcuts visibility settings
    
    Change-Id: Ief43683dca14fa1c92a6d253da07a7f79eeb6832
    Reviewed-on: https://gerrit.libreoffice.org/53616
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9d5204b82760..5832e8de55f9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2800,6 +2800,8 @@ VclPtr<PopupMenu> Edit::CreatePopupMenu()
         pPopup->SetAccelKey(pPopup->GetItemId("copy"), vcl::KeyCode( KeyFuncType::COPY));
         pPopup->SetAccelKey(pPopup->GetItemId("paste"), vcl::KeyCode( KeyFuncType::PASTE));
         pPopup->SetAccelKey(pPopup->GetItemId("delete"), vcl::KeyCode( KeyFuncType::DELETE));
+        pPopup->SetAccelKey(pPopup->GetItemId("selectall"), vcl::KeyCode( KEY_A, false, true, false, false));
+        pPopup->SetAccelKey(pPopup->GetItemId("specialchar"), vcl::KeyCode( KEY_S, true, true, false, false));
     }
     return pPopup;
 }
diff --git a/vcl/uiconfig/ui/editmenu.ui b/vcl/uiconfig/ui/editmenu.ui
index a9fb3508531c..522fd2e0ebb7 100644
--- a/vcl/uiconfig/ui/editmenu.ui
+++ b/vcl/uiconfig/ui/editmenu.ui
@@ -63,7 +63,6 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="editmenu|selectall">Select _All</property>
         <property name="use_underline">True</property>
-        <accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
       </object>
     </child>
     <child>
@@ -72,7 +71,6 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="editmenu|specialchar">_Special Character...</property>
         <property name="use_underline">True</property>
-        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
       </object>
     </child>
   </object>