diff options
| author | Mathieu Vonlanthen <mat_von@fastmail.fm> | 2012-07-19 11:02:45 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-23 15:12:44 +0100 |
| commit | 0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b (patch) | |
| tree | 5b545b1e2a221f5a1b3d36acc3298bcb2f3649f8 /vcl | |
| parent | 65e2c77e762a667b965ab3dc2bcaf8b8d1a0bc91 (diff) | |
fdo#48549 System::Beep() removal
Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/field2.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 13 |
2 files changed, 1 insertions, 19 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 9244df52870f..43c324a628c2 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -624,7 +624,6 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, // mask is equal at all input positions if ( !bSameMask ) { - Sound::Beep(); return sal_True; } } @@ -730,9 +729,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, aStr += cChar; } - if ( bError ) - Sound::Beep(); - else + if ( !bError ) { rbInKeyInput = sal_True; Selection aNewSel( ImplPatternRightPos( aStr, rEditMask, nFormatFlags, bSameMask, nNewPos ) ); @@ -742,8 +739,6 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, rbInKeyInput = sal_False; } } - else - Sound::Beep(); return sal_True; } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index d39ac242dd76..cbc06c51e029 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -4971,12 +4971,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) } } else - { - // Beep for invalid keys, except for HELP and F-keys - if ( !rKEvent.GetKeyCode().IsMod2() && ( nCode != KEY_HELP ) && ( rKEvent.GetKeyCode().GetGroup() != KEYGROUP_FKEYS ) ) - Sound::Beep(); FloatingWindow::KeyInput( rKEvent ); - } } } // #105474# check if menu window was not destroyed @@ -5746,14 +5741,6 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF ChangeHighlightItem( nEntry, sal_True ); bDone = sal_True; } - else - { - // only validate own character combinations due - // to systemmenu's and other system-hotkeyes - sal_uInt16 nKeyCode = rKEvent.GetKeyCode().GetCode(); - if ( ((nKeyCode >= KEY_A) && (nKeyCode <= KEY_Z)) ) - Sound::Beep(); - } } } return bDone; |