Kaydet (Commit) cd44a728 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

revert the KeyCode asserts

there are two many places it appears to trigger in real use.
will have to fix those first.

Change-Id: I536b7925033d5337ba360db3c2cf40ec205157ca
Reviewed-on: https://gerrit.libreoffice.org/12193Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 1a178bd5
...@@ -79,15 +79,12 @@ public: ...@@ -79,15 +79,12 @@ public:
inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier ) inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier )
{ {
assert(nKey <= KEY_CODE);
assert(nModifier == 0 || (nModifier >= 0x1000 && nModifier <= 0xf000));
nKeyCodeAndModifiers = nKey | nModifier; nKeyCodeAndModifiers = nKey | nModifier;
eFunc = KeyFuncType::DONTKNOW; eFunc = KeyFuncType::DONTKNOW;
} }
inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 ) inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 )
{ {
assert(nKey <= KEY_CODE);
nKeyCodeAndModifiers = nKey; nKeyCodeAndModifiers = nKey;
if( bShift ) if( bShift )
nKeyCodeAndModifiers |= KEY_SHIFT; nKeyCodeAndModifiers |= KEY_SHIFT;
......
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