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 /basctl | |
parent | 65e2c77e762a667b965ab3dc2bcaf8b8d1a0bc91 (diff) |
fdo#48549 System::Beep() removal
Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 17 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 22 | ||||
-rw-r--r-- | basctl/source/basicide/brkdlg.cxx | 1 |
3 files changed, 2 insertions, 38 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index d427a30430dd..0c91e85f3dd1 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -546,7 +546,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine ) CheckCompileBasic(); if ( aStatus.bError ) { - Sound::Beep(); return sal_False; } @@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine ) } } } - - if ( !bNewBreakPoint ) - Sound::Beep(); } } @@ -753,7 +749,6 @@ void ModulWindow::BasicAddWatch() { DBG_CHKTHIS( ModulWindow, 0 ); String aWatchStr; - sal_Bool bInserted = sal_False; AssertValidEditEngine(); sal_Bool bAdd = sal_True; if ( !GetEditView()->HasSelection() ) @@ -780,9 +775,6 @@ void ModulWindow::BasicAddWatch() bInserted = sal_True; } } - - if ( !bInserted ) - Sound::Beep(); } @@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch() void ModulWindow::BasicRemoveWatch() { DBG_CHKTHIS( ModulWindow, 0 ); - bool bRemoved = pLayout->GetWatchWindow().RemoveSelectedWatch(); - - if ( !bRemoved ) - Sound::Beep(); + pLayout->GetWatchWindow().RemoveSelectedWatch(); } @@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest& rReq ) } break; case SID_BASICIDE_MATCHGROUP: - { - if ( !GetEditView()->MatchGroup() ) - Sound::Beep(); - } break; case SID_BASICIDE_TOGGLEBRKPNT: { diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 0e63635750fc..d10859c1ae4d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1496,8 +1496,6 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc ) aXEdit.SetSelection( Selection( 0, 0xFFFF ) ); UpdateWatches(); } - else - Sound::Beep(); } break; case KEY_ESCAPE: @@ -1942,9 +1940,6 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) } } - if ( !bEdit ) - Sound::Beep(); - return bEdit; } @@ -1962,22 +1957,10 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString aResult = aResult.Copy( 1, nResultLen - 2 ); sal_Bool bResModified = ( aResult != aEditingRes ) ? sal_True : sal_False; - sal_Bool bError = sal_False; - if ( !aVName.Len() ) - { - bError = sal_True; - } - sal_Bool bRet = sal_False; - if ( bError ) - { - Sound::Beep(); - } - else if ( bResModified ) - { + if ( bResModified ) bRet = ImplBasicEntryEdited( pEntry, aResult ); - } return bRet; } @@ -2024,9 +2007,6 @@ sal_Bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const Stri SbxBase::ResetError(); } - if ( bError ) - Sound::Beep(); - UpdateWatches(); // The text should never be taken/copied 1:1, diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 03a66ed6c590..d0b6f22aae74 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -208,7 +208,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) { aComboBox.SetText( aText ); aComboBox.GrabFocus(); - Sound::Beep(); } CheckButtons(); } |