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

[Noel Grandin]

 include/vcl/keycod.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 654da83ac27fbf84b3813172724ff4ad52782d60
Author: Noel Grandin <noel at peralex.com>
Date:   Sat Nov 1 14:56:32 2014 +0200

    fix assert I added to KeyCode
    
    in commit 9044260c35b22aeb6
    "add some asserts to validate KeyCode values"
    
    Change-Id: I73dc4c9ee5e4ced699d44ecdfb306a49b853f67e
    Reviewed-on: https://gerrit.libreoffice.org/12180
    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 a82a2de..8c344b0 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -80,7 +80,7 @@ public:
 inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier )
 {
     assert(nKey <= KEY_CODE);
-    assert(nModifier >= KEY_MODTYPE);
+    assert(nModifier >= 0x1000 && nModifier <= 0xf000);
     nKeyCodeAndModifiers = nKey | nModifier;
     eFunc = KeyFuncType::DONTKNOW;
 }