KEY_ALLMOD is the same as KEY_MOD

so just dump it

Change-Id: I006045aea345e84ff1944fc1ed1daa94bd7bca61

6 files changed, 5 insertions, 8 deletions

diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx
index ca3f51359f30..7c6f598b8224 100644
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
@@ -139,7 +139,6 @@ namespace o3tl
 #define KEY_MOD2        ((sal_uInt16)0x4000)
 #define KEY_MOD3        ((sal_uInt16)0x8000)
 #define KEY_MODTYPE     ((sal_uInt16)0xF000)
-#define KEY_ALLMODTYPE  ((sal_uInt16)0xF000)
 
 #endif
 
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index cfa60fe8b98a..0309f12b6e4e 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -54,8 +54,6 @@ public:
 
     sal_uInt16      GetModifier() const
                     { return (nCode & KEY_MODTYPE); }
-    sal_uInt16      GetAllModifier() const
-                    { return (nCode & KEY_ALLMODTYPE); }
     bool            IsShift() const
                     { return ((nCode & KEY_SHIFT) != 0); }
     bool            IsMod1() const
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 66f6484607cf..c98211e1bcc5 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -435,7 +435,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
             {
                 // The page-up key switches layers or pages depending on the
                 // modifier key.
-                if ( ! rKEvt.GetKeyCode().GetAllModifier())
+                if ( ! rKEvt.GetKeyCode().GetModifier())
                 {
                     // With no modifier pressed we move to the previous
                     // slide.
@@ -482,7 +482,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
             {
                 // The page-down key switches layers or pages depending on the
                 // modifier key.
-                if ( ! rKEvt.GetKeyCode().GetAllModifier())
+                if ( ! rKEvt.GetKeyCode().GetModifier())
                 {
                     // With no modifier pressed we move to the next slide.
                     mpView->SdrEndTextEdit();
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index cfa98ea8c4f9..6f36879c38f6 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -172,7 +172,7 @@ namespace svt { namespace table
         const _ActionMapEntry* pActions = aKnownActions;
         for ( ; pActions->eAction != invalidTableControlAction; ++pActions )
         {
-            if ( ( pActions->nKeyCode == nKeyCode ) && ( pActions->nKeyModifier == rKeyCode.GetAllModifier() ) )
+            if ( ( pActions->nKeyCode == nKeyCode ) && ( pActions->nKeyModifier == rKeyCode.GetModifier() ) )
             {
                 bHandled = _rControl.dispatchAction( pActions->eAction );
                 break;
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 41e7711ebd03..6d13eed8d4f7 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -742,7 +742,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem,
 
     DBG_ASSERT( nCommandKey, "unmapped accelerator key" );
 
-    nModifier=rKeyCode.GetAllModifier();
+    nModifier=rKeyCode.GetModifier();
 
     // should always use the command key
     int nItemModifier = 0;
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index 6fcae4a58830..6b980c259206 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.cxx
@@ -33,7 +33,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
     KeyEvent aClone(*this);
 
     sal_uInt16 nCode = maKeyCode.GetCode();
-    sal_uInt16 nMod  = maKeyCode.GetAllModifier();
+    sal_uInt16 nMod  = maKeyCode.GetModifier();
 
     switch (eMode)
     {