[Libreoffice-commits] core.git: include/vcl

Noel Grandin noel at peralex.com
Sat Nov 1 22:07:27 PDT 2014


 include/vcl/keycod.hxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit cd44a7288e09ffadd34d9fe1a71b7462429c5c65
Author: Noel Grandin <noel at peralex.com>
Date:   Sun Nov 2 07:04:58 2014 +0200

    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/12193
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 7e7ece3..a1da5d9 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -79,15 +79,12 @@ public:
 
 inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier )
 {
-    assert(nKey <= KEY_CODE);
-    assert(nModifier == 0 || (nModifier >= 0x1000 && nModifier <= 0xf000));
     nKeyCodeAndModifiers = nKey | nModifier;
     eFunc = KeyFuncType::DONTKNOW;
 }
 
 inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 )
 {
-    assert(nKey <= KEY_CODE);
     nKeyCodeAndModifiers = nKey;
     if( bShift )
         nKeyCodeAndModifiers |= KEY_SHIFT;


More information about the Libreoffice-commits mailing list