include/vcl/keycod.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit c75466ac88a47859227efc635fa1fcd5edd0a277 Author: Noel Grandin <[email protected]> Date: Sat Nov 1 19:10:19 2014 +0200 second attempt at fixing my asserts it appears I can't trust the buildbots, they don't seem to be compiling with asserts Change-Id: Ia49f5d3f134cf1a578469ddcbc7c492383aa971d Reviewed-on: https://gerrit.libreoffice.org/12184 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 8c344b0..7e7ece3 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 >= 0x1000 && nModifier <= 0xf000); + assert(nModifier == 0 || (nModifier >= 0x1000 && nModifier <= 0xf000)); nKeyCodeAndModifiers = nKey | nModifier; eFunc = KeyFuncType::DONTKNOW; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
