Kaydet (Commit) 7eb519e9 authored tarafından Noel Grandin's avatar Noel Grandin

KEY_ALLMOD is the same as KEY_MOD

so just dump it

Change-Id: I006045aea345e84ff1944fc1ed1daa94bd7bca61
üst c91e045c
...@@ -139,7 +139,6 @@ namespace o3tl ...@@ -139,7 +139,6 @@ namespace o3tl
#define KEY_MOD2 ((sal_uInt16)0x4000) #define KEY_MOD2 ((sal_uInt16)0x4000)
#define KEY_MOD3 ((sal_uInt16)0x8000) #define KEY_MOD3 ((sal_uInt16)0x8000)
#define KEY_MODTYPE ((sal_uInt16)0xF000) #define KEY_MODTYPE ((sal_uInt16)0xF000)
#define KEY_ALLMODTYPE ((sal_uInt16)0xF000)
#endif #endif
......
...@@ -54,8 +54,6 @@ public: ...@@ -54,8 +54,6 @@ public:
sal_uInt16 GetModifier() const sal_uInt16 GetModifier() const
{ return (nCode & KEY_MODTYPE); } { return (nCode & KEY_MODTYPE); }
sal_uInt16 GetAllModifier() const
{ return (nCode & KEY_ALLMODTYPE); }
bool IsShift() const bool IsShift() const
{ return ((nCode & KEY_SHIFT) != 0); } { return ((nCode & KEY_SHIFT) != 0); }
bool IsMod1() const bool IsMod1() const
......
...@@ -435,7 +435,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) ...@@ -435,7 +435,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{ {
// The page-up key switches layers or pages depending on the // The page-up key switches layers or pages depending on the
// modifier key. // modifier key.
if ( ! rKEvt.GetKeyCode().GetAllModifier()) if ( ! rKEvt.GetKeyCode().GetModifier())
{ {
// With no modifier pressed we move to the previous // With no modifier pressed we move to the previous
// slide. // slide.
...@@ -482,7 +482,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) ...@@ -482,7 +482,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{ {
// The page-down key switches layers or pages depending on the // The page-down key switches layers or pages depending on the
// modifier key. // modifier key.
if ( ! rKEvt.GetKeyCode().GetAllModifier()) if ( ! rKEvt.GetKeyCode().GetModifier())
{ {
// With no modifier pressed we move to the next slide. // With no modifier pressed we move to the next slide.
mpView->SdrEndTextEdit(); mpView->SdrEndTextEdit();
......
...@@ -172,7 +172,7 @@ namespace svt { namespace table ...@@ -172,7 +172,7 @@ namespace svt { namespace table
const _ActionMapEntry* pActions = aKnownActions; const _ActionMapEntry* pActions = aKnownActions;
for ( ; pActions->eAction != invalidTableControlAction; ++pActions ) 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 ); bHandled = _rControl.dispatchAction( pActions->eAction );
break; break;
......
...@@ -742,7 +742,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, ...@@ -742,7 +742,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem,
DBG_ASSERT( nCommandKey, "unmapped accelerator key" ); DBG_ASSERT( nCommandKey, "unmapped accelerator key" );
nModifier=rKeyCode.GetAllModifier(); nModifier=rKeyCode.GetModifier();
// should always use the command key // should always use the command key
int nItemModifier = 0; int nItemModifier = 0;
......
...@@ -33,7 +33,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const ...@@ -33,7 +33,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
KeyEvent aClone(*this); KeyEvent aClone(*this);
sal_uInt16 nCode = maKeyCode.GetCode(); sal_uInt16 nCode = maKeyCode.GetCode();
sal_uInt16 nMod = maKeyCode.GetAllModifier(); sal_uInt16 nMod = maKeyCode.GetModifier();
switch (eMode) switch (eMode)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment