diff options
| author | Frank Schönheit <fs@openoffice.org> | 2002-01-23 14:34:04 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2002-01-23 14:34:04 +0000 |
| commit | 56cde92421e4dff0471a670268da3a36ec9b4b4b (patch) | |
| tree | 2e80e11d88f8f530c8b61138f5cab3b68d631b40 /svtools | |
| parent | 994cd22b8d4018afb39fdbcc21a316290ec4b722 (diff) | |
#96861# KeyInput: don't start all these special features when a modifier is pressed
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/fileview.cxx | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 19abd1dd3e1b..2d27aa0a58b0 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fileview.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2002-01-03 10:43:54 $ + * last change: $Author: fs $ $Date: 2002-01-23 15:34:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -958,23 +958,33 @@ void ViewTabListBox_Impl::Resize() void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) { - if ( rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) - { - ResetQuickSearch_Impl( NULL ); - GetDoubleClickHdl().Call( this ); - } - else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ) && - mbEnableDelete ) - { - ResetQuickSearch_Impl( NULL ); - DeleteEntries(); - } - else if ( ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_NUM ) || - ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_ALPHA ) ) + bool bHandled = false; + + const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + if ( 0 == rKeyCode.GetModifier() ) { - DoQuickSearch( rKEvt.GetCharCode() ); + if ( rKeyCode.GetCode() == KEY_RETURN ) + { + ResetQuickSearch_Impl( NULL ); + GetDoubleClickHdl().Call( this ); + bHandled = true; + } + else if ( ( rKeyCode.GetCode() == KEY_DELETE ) && + mbEnableDelete ) + { + ResetQuickSearch_Impl( NULL ); + DeleteEntries(); + bHandled = true; + } + else if ( ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_NUM ) || + ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_ALPHA ) ) + { + DoQuickSearch( rKEvt.GetCharCode() ); + bHandled = true; + } } - else + + if ( !bHandled ) { ResetQuickSearch_Impl( NULL ); SvHeaderTabListBox::KeyInput( rKEvt ); |