Hi,
Here is my license statement:
-----
All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.
------
I send a new version of the patch taking into account the last commits.
I didn't add error reporting because I don't know the official way to do
this.
Best regards
Mathieu Vonlanthen
--
http://www.fastmail.fm - IMAP accessible web-mail
From 499921f466ae4db5aeb3ccdc9c8c59e98b290cfe Mon Sep 17 00:00:00 2001
From: Mathieu Vonlanthen <mat_von@fastmail.fm>
Date: Thu, 19 Jul 2012 11:02:45 +0200
Subject: [PATCH] fdo#48549 System::Beep() removal
Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
---
basctl/source/basicide/baside2.cxx | 17 +------------
basctl/source/basicide/baside2b.cxx | 22 +---------------
basctl/source/basicide/brkdlg.cxx | 1 -
basic/source/runtime/methods.cxx | 1 -
formula/source/ui/dlg/funcutl.cxx | 4 ---
sc/source/core/data/documen4.cxx | 2 --
sc/source/ui/app/inputhdl.cxx | 6 -----
sc/source/ui/docshell/docfunc.cxx | 6 -----
sc/source/ui/docshell/olinefun.cxx | 8 ------
sc/source/ui/navipi/content.cxx | 2 --
sc/source/ui/navipi/navipi.cxx | 2 --
sc/source/ui/view/editsh.cxx | 12 ---------
sc/source/ui/view/gridwin.cxx | 10 --------
sc/source/ui/view/gridwin2.cxx | 2 --
sc/source/ui/view/select.cxx | 1 -
sc/source/ui/view/tabcont.cxx | 3 ---
sc/source/ui/view/tabvwshe.cxx | 1 -
sc/source/ui/view/viewfun2.cxx | 4 ---
sc/source/ui/view/viewfun6.cxx | 47 ++++++-----------------------------
sc/source/ui/view/viewfunc.cxx | 2 --
svtools/source/contnr/fileview.cxx | 3 ---
svtools/source/contnr/svlbitm.cxx | 2 --
svtools/source/contnr/svtreebx.cxx | 1 -
svtools/source/edit/textview.cxx | 5 ----
svx/source/fmcomp/gridctrl.cxx | 1 -
svx/source/form/tbxform.cxx | 1 -
svx/workben/edittest.cxx | 2 --
sw/source/ui/utlui/content.cxx | 6 +----
vcl/source/control/field2.cxx | 7 +-----
vcl/source/window/menu.cxx | 13 ----------
30 files changed, 12 insertions(+), 182 deletions(-)
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d427a30..0c91e85 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 0e63635..d10859c 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 03a66ed..d0b6f22 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();
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 33fd737..5dcdfce 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3919,7 +3919,6 @@ RTLFUNC(Beep)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- Sound::Beep();
}
RTLFUNC(Load)
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index c5820f8..0a46fae 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -179,11 +179,7 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
{
pEd->GrabFocus();
}
- else
- Sound::Beep();
}
- else
- Sound::Beep();
}
else
RefEdit::KeyInput( rKEvt );
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 41e058a..a315f3c 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -146,7 +146,6 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
nTab1 = i;
if (!bStop)
{
- Sound::Beep();
OSL_FAIL("ScDocument::InsertMatrixFormula Keine Tabelle markiert");
return;
}
@@ -239,7 +238,6 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera
nTab1 = i;
if (!bStop)
{
- Sound::Beep();
OSL_FAIL("ScDocument::InsertTableOp: Keine Tabelle markiert");
return;
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index cbadad7..5721c88 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1659,12 +1659,6 @@ void ScInputHandler::NextAutoEntry( bool bBack )
bInOwnChange = false;
}
- else
- {
- // mehr gibts nicht
-
- Sound::Beep();
- }
}
}
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 29dda06..f6941a1 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4520,17 +4520,13 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool
bRecord
bRecord = false;
ScDocument* pUndoDoc = NULL;
- bool bBeep = false;
for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
itr != itrEnd; ++itr)
{
SCTAB nTab = *itr;
ScRange aRange = rOption.getSingleRange(nTab);
if ( !pDoc->HasAttrib(aRange, HASATTR_MERGED) )
- {
- bBeep = true;
continue;
- }
ScRange aExtended = aRange;
pDoc->ExtendMerge(aExtended);
@@ -4563,8 +4559,6 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool
bRecord
if ( !AdjustRowHeight( aExtended ) )
rDocShell.PostPaint( aExtended, PAINT_GRID );
}
- if (bBeep && !bApi)
- Sound::Beep();
if (bRecord)
{
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 455bc56..3c177eb 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -271,8 +271,6 @@ sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_
lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
bSuccess = sal_True;
}
- else if (!bApi)
- Sound::Beep();
return bSuccess;
}
@@ -548,9 +546,6 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b
lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
}
- if (!bDone && !bApi)
- Sound::Beep();
-
return bDone;
}
@@ -646,9 +641,6 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b
lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
}
- if (!bDone && !bApi)
- Sound::Beep();
-
return bDone;
}
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 30df413..e6e92cb 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1296,8 +1296,6 @@ sal_Bool ScContentTree::LoadFile( const String& rUrl )
pParentWindow->GetDocNames( &aHiddenTitle ); // Liste fuellen
}
- else
- Sound::Beep(); // Fehler beim Laden
// Dokument wird im dtor von ScDocumentLoader wieder geschlossen
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6b2f9aa..d89f87b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -1034,8 +1034,6 @@ void ScNavigatorDlg::SetCurrentTableStr( const rtl::OUString& rName )
return;
}
}
-
- Sound::Beep(); // Tabelle nicht gefunden
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 66ac488..305b24b 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -292,10 +292,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
// while the dialog was open, edit mode may have been stopped
if (!SC_MOD()->IsInputMode())
- {
- Sound::Beep();
return;
- }
if (nFormat > 0)
{
@@ -366,10 +363,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
// while the dialog was open, edit mode may have been stopped
if (!SC_MOD()->IsInputMode())
- {
- Sound::Beep();
return;
- }
}
if ( aString.Len() )
@@ -420,7 +414,6 @@ void ScEditShell::Execute( SfxRequest& rReq )
// while the dialog was open, edit mode may have been stopped
if (!SC_MOD()->IsInputMode())
{
- Sound::Beep();
delete pDlg;
return;
}
@@ -466,7 +459,6 @@ void ScEditShell::Execute( SfxRequest& rReq )
// while the dialog was open, edit mode may have been stopped
if (!SC_MOD()->IsInputMode())
{
- Sound::Beep();
delete pDlg;
return;
}
@@ -482,7 +474,6 @@ void ScEditShell::Execute( SfxRequest& rReq )
case SID_TOGGLE_REL:
{
- bool bOk = false;
if (pEngine->GetParagraphCount() == 1)
{
String aText = pEngine->GetText();
@@ -502,14 +493,11 @@ void ScEditShell::Execute( SfxRequest& rReq )
pTopView->GetEditEngine()->SetText( aNew );
pTopView->SetSelection( aNewSel );
}
- bOk = true;
// Referenz wird selektiert -> beim Tippen nicht ueberschreiben
bSetSelIsRef = sal_True;
}
}
- if (!bOk)
- Sound::Beep(); // keine Referenzen oder mehrere Absaetze
}
break;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d5400f3..3ef6eb1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1401,7 +1401,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool
bDataSelec
{
DELETEZ(pFilterBox); // war nix
DELETEZ(pFilterFloat);
- Sound::Beep(); // bemerkbar machen
}
else
{
@@ -1775,10 +1774,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
ScModule* pScMod = SC_MOD();
if (pScMod->IsModalMode(pViewData->GetSfxDocShell()))
- {
- Sound::Beep();
return;
- }
pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird
nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen
@@ -2143,8 +2139,6 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
::svl::IUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager();
if ( pMgr->GetUndoActionCount() && pMgr->GetUndoActionId() == STR_UNDO_APPLYCELLSTYLE )
pMgr->Undo();
- else
- Sound::Beep();
return;
}
@@ -2330,8 +2324,6 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
Sequence<sheet::DataPilotFieldFilter> aFilters;
if ( pDPObj->GetDataFieldPositionData(aCellPos, aFilters) )
pViewData->GetView()->ShowDataPilotSourceData( *pDPObj, aFilters );
- else
- Sound::Beep(); // nothing to expand/collapse/show
}
return;
@@ -4199,8 +4191,6 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL
nDestPos
pDocSh->GetUndoManager()->LeaveListAction();
- if (!bDone)
- Sound::Beep(); // instead of error message in drop handler
}
else
bDone = sal_True; // nothing to do
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 0c7fb54..d569a49 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -234,8 +234,6 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
}
delete pDlg;
}
- else
- Sound::Beep();
}
else
{
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 5bcaa84..6536d5a 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -229,7 +229,6 @@ void ScViewFunctionSet::BeginDrag()
}
}
- Sound::Beep(); // can't drag
}
// Selection
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 26a7017..bc5cf50 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -230,7 +230,6 @@ void ScTabControl::Select()
SelectPage( static_cast<sal_uInt16>(i)+1, rMark.GetTableSelect(i) );
SetCurPageId( static_cast<sal_uInt16>(pViewData->GetTabNo()) + 1 );
- Sound::Beep();
return;
}
@@ -517,8 +516,6 @@ sal_Int8 ScTabControl::ExecuteDrop( const ExecuteDropEvent& rEvt )
rData.pCellTransfer->SetDragWasInternal(); // don't delete
return sal_True;
}
- else
- Sound::Beep();
}
}
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index f3c678f..3f941bc 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -198,7 +198,6 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
if ( !SelectionEditable() )
{
// no error message (may be called from drag&drop)
- Sound::Beep();
return;
}
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index dcc3b05..e3515d79 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2832,8 +2832,6 @@ void ScViewFunc::ShowTable( const String& rName )
pDocSh->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS);
pDocSh->SetDocumentModified();
}
- else
- Sound::Beep();
}
@@ -2868,8 +2866,6 @@ void ScViewFunc::HideTable( SCTAB nTab )
pDocSh->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS);
pDocSh->SetDocumentModified();
}
- else
- Sound::Beep();
}
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 87f5ec1..2b9c1f7 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -66,87 +66,56 @@ using ::std::vector;
void ScViewFunc::DetectiveAddPred()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveAddPred( GetViewData()->GetCurPos() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveAddPred( GetViewData()->GetCurPos() );
RecalcPPT(); //! use broadcast in DocFunc instead?
}
void ScViewFunc::DetectiveDelPred()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveDelPred( GetViewData()->GetCurPos() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveDelPred( GetViewData()->GetCurPos() );
RecalcPPT();
}
void ScViewFunc::DetectiveAddSucc()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveAddSucc( GetViewData()->GetCurPos() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveAddSucc( GetViewData()->GetCurPos() );
RecalcPPT();
}
void ScViewFunc::DetectiveDelSucc()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveDelSucc( GetViewData()->GetCurPos() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveDelSucc( GetViewData()->GetCurPos() );
RecalcPPT();
}
void ScViewFunc::DetectiveAddError()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveAddError( GetViewData()->GetCurPos() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveAddError( GetViewData()->GetCurPos() );
RecalcPPT();
}
void ScViewFunc::DetectiveDelAll()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveDelAll( GetViewData()->GetTabNo() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveDelAll( GetViewData()->GetTabNo() );
RecalcPPT();
}
void ScViewFunc::DetectiveMarkInvalid()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().
- DetectiveMarkInvalid( GetViewData()->GetTabNo() );
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveMarkInvalid( GetViewData()->GetTabNo() );
RecalcPPT();
}
void ScViewFunc::DetectiveRefresh()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- sal_Bool bDone = pDocSh->GetDocFunc().DetectiveRefresh();
- if (!bDone)
- Sound::Beep();
-
+ pDocSh->GetDocFunc().DetectiveRefresh();
RecalcPPT();
}
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 4f0b304..b55d508 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2753,8 +2753,6 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
// ATTR_LANGUAGE_FORMAT not
ApplySelectionPattern( aNewAttrs, sal_True );
}
- else
- Sound::Beep(); // was nothing
}
void ScViewFunc::ChangeIndent( sal_Bool bIncrement )
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7b3eb3c..d0b95b1 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1143,9 +1143,6 @@ void ViewTabListBox_Impl::DoQuickSearch( const xub_Unicode& rChar )
bFound = sal_False;
}
- if ( !bFound )
- Sound::Beep();
-
maResetQuickSearch.Start();
}
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 7826d9c6..eff3939 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -461,8 +461,6 @@ void SvLBoxButton::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
bool SvLBoxButton::CheckModification() const
{
- if( eKind == SvLBoxButtonKind_disabledCheckbox )
- Sound::Beep();
return eKind == SvLBoxButtonKind_enabledCheckbox;
}
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 9cb3966..ec7d135 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -742,7 +742,6 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
SvLBoxEntry* pEntry = First();
pEntry = NextVisible( pEntry );
SetEntryText( pEntry, "SetEntryText" );
- Sound::Beep();
}
break;
}
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 289a844..e03ef2e 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -2009,12 +2009,7 @@ sal_Bool TextView::ImplCheckTextLen( const String& rNewText )
// nur dann noch ermitteln, wie viel Text geloescht wird
n -= mpImpl->mpTextEngine->GetTextLen( mpImpl->maSelection );
if ( n > mpImpl->mpTextEngine->GetMaxTextLen() )
- {
- // Beep hat hier eigentlich nichts verloren, sondern lieber ein Hdl,
- // aber so funktioniert es wenigstens in ME, BasicIDE, SourceView
- Sound::Beep();
bOK = sal_False;
- }
}
}
return bOK;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index cdb9db5..c675dd4 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2579,7 +2579,6 @@ void DbGridControl::MoveToPosition(sal_uInt32 nPos)
if (!m_pSeekCursor->absolute(nPos + 1))
{
AdjustRows();
- Sound::Beep();
return;
}
else
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index ea3459b..0de29df 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -88,7 +88,6 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
sal_Int64 nRecord = GetValue();
if (nRecord < GetMin() || nRecord > GetMax())
{
- Sound::Beep();
return;
}
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index f204a94..4491e3a 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -238,8 +238,6 @@ void __EXPORT MyEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT nPa
bURLClicked = TRUE;
UpdateFields();
}
- else
- Sound::Beep();
}
void __EXPORT MyEditEngine::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index e14e88f..7842e4e 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2181,9 +2181,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
}
else
{
- if( pShell->IsProtectedOutlinePara() )
- Sound::Beep(); //konnte nicht umgestuft werden
- else
+ if( !pShell->IsProtectedOutlinePara() )
pShell->OutlineUpDown( nCmd == FN_ITEM_LEFT ? -1 : 1 );
}
@@ -2208,8 +2206,6 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
}
}
}
- else
- Sound::Beep(); //konnte nicht verschoben werden
}
}
}
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 9244df5..43c324a 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 d39ac24..cbc06c5 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;
--
1.7.9.5
Context
- Re: [PATCH (partial)] fdo#48549 System::Beep() removal · Mathieu Vonlanthen
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.