Attachment 64931 Details for Bug 48549 – Patch for fdo#48549 System::Beep() removal v3

[patch] Patch for fdo#48549 System::Beep() removal v3

0011-fdo-48549-System-Beep-removal.patch (text/plain), 35.81 KB, created by Meko Otar on 2012-07-29 22:04:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Meko Otar

Created: 2012-07-29 22:04:33 UTC

Size: 35.81 KB

patch

obsolete

>From 8f43b49730c2d496041029062f7951a427b21b17 Mon Sep 17 00:00:00 2001
>From: Mathieu Vonlanthen <mat_von@fastmail.fm>
>Date: Sat, 28 Jul 2012 16:13:18 +0200
>Subject: [PATCH] Bug 48549 - System::Beep() removal
>
>Change-Id: I011048912af051a762a78af8646513a1fc624073
>---
> basctl/source/basicide/baside2.cxx                 |    1 -
> basctl/source/basicide/baside2b.cxx                |    1 -
> basctl/source/basicide/basides2.cxx                |    1 -
> basctl/source/basicide/brkdlg.cxx                  |    1 -
> basctl/source/basicide/objdlg.cxx                  |    1 -
> basic/source/runtime/methods.cxx                   |    1 -
> basic/source/sbx/sbxobj.cxx                        |    1 -
> cui/source/dialogs/colorpicker.cxx                 |    1 -
> cui/source/dialogs/cuicharmap.cxx                  |    5 +--
> cui/source/dialogs/cuitbxform.cxx                  |    1 -
> formula/source/ui/dlg/funcutl.cxx                  |    1 -
> sc/source/core/data/documen4.cxx                   |    1 -
> sc/source/ui/app/inputhdl.cxx                      |    1 -
> sc/source/ui/docshell/docfunc.cxx                  |    1 -
> sc/source/ui/docshell/olinefun.cxx                 |    1 -
> sc/source/ui/navipi/content.cxx                    |    1 -
> sc/source/ui/navipi/navipi.cxx                     |    1 -
> sc/source/ui/view/dbfunc3.cxx                      |    1 -
> sc/source/ui/view/editsh.cxx                       |    1 -
> sc/source/ui/view/gridwin.cxx                      |    1 -
> sc/source/ui/view/gridwin2.cxx                     |    1 -
> sc/source/ui/view/preview.cxx                      |    1 -
> sc/source/ui/view/select.cxx                       |    1 -
> sc/source/ui/view/tabcont.cxx                      |    1 -
> sc/source/ui/view/tabvwshe.cxx                     |    1 -
> sc/source/ui/view/viewfun2.cxx                     |    1 -
> sc/source/ui/view/viewfun6.cxx                     |    1 -
> sc/source/ui/view/viewfunc.cxx                     |    1 -
> .../controller/SlsSelectionFunction.cxx            |    1 -
> sfx2/source/appl/app.cxx                           |    1 -
> sfx2/source/appl/appcfg.cxx                        |    1 -
> sfx2/source/dialog/passwd.cxx                      |    2 -
> starmath/source/dialog.cxx                         |    1 -
> svtools/source/contnr/fileview.cxx                 |    1 -
> svtools/source/contnr/svlbitm.cxx                  |    1 -
> svtools/source/edit/textview.cxx                   |    1 -
> svx/inc/svx/galctrl.hxx                            |    1 -
> svx/source/fmcomp/gridctrl.cxx                     |    1 -
> svx/source/form/fmexpl.cxx                         |    1 -
> svx/source/form/fmshell.cxx                        |    1 -
> svx/source/form/tbxform.cxx                        |    1 -
> svx/source/gengal/gengal.cxx                       |    1 -
> svx/workben/edittest.cxx                           |    1 -
> sw/source/core/doc/docedt.cxx                      |    3 --
> sw/source/core/layout/paintfrm.cxx                 |    1 -
> sw/source/core/text/frmpaint.cxx                   |    1 -
> sw/source/ui/dochdl/swdtflvr.cxx                   |    1 -
> sw/source/ui/utlui/content.cxx                     |    1 -
> sw/source/ui/wrtsh/wrtsh1.cxx                      |    1 -
> vcl/Library_vcl.mk                                 |    1 -
> vcl/Package_inc.mk                                 |    1 -
> vcl/inc/vcl/msgbox.hxx                             |    1 -
> vcl/inc/vcl/sound.hxx                              |   41 --------------------
> vcl/source/app/dbggui.cxx                          |    2 -
> vcl/source/app/sound.cxx                           |   40 -------------------
> vcl/source/control/field2.cxx                      |    1 -
> vcl/source/control/scrbar.cxx                      |    7 ----
> vcl/source/control/tabctrl.cxx                     |    1 -
> vcl/source/window/menu.cxx                         |    1 -
> vcl/source/window/msgbox.cxx                       |    8 ----
> vcl/source/window/syswin.cxx                       |    4 --
> vcl/source/window/toolbox.cxx                      |    2 -
> vcl/source/window/winproc.cxx                      |    8 +---
> 63 files changed, 2 insertions(+), 172 deletions(-)
> delete mode 100644 vcl/inc/vcl/sound.hxx
> delete mode 100644 vcl/source/app/sound.cxx
>
>diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
>index 5f7fe56a..1eab598 100644
>--- a/basctl/source/basicide/baside2.cxx
>+++ b/basctl/source/basicide/baside2.cxx
>@@ -45,7 +45,6 @@
> #include <svtools/xtextedt.hxx>
> #include <toolkit/helper/vclunohelper.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> 
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
>diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
>index bf82724..a5702c1 100644
>--- a/basctl/source/basicide/baside2b.cxx
>+++ b/basctl/source/basicide/baside2b.cxx
>@@ -37,7 +37,6 @@
> #include <sfx2/dispatch.hxx>
> #include <sfx2/viewfrm.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <svl/urihelper.hxx>
> #include <svtools/xtextedt.hxx>
> #include <svtools/txtattr.hxx>
>diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
>index c68585c..4de4d77 100644
>--- a/basctl/source/basicide/basides2.cxx
>+++ b/basctl/source/basicide/basides2.cxx
>@@ -24,7 +24,6 @@
> 
> #include <com/sun/star/frame/XTitle.hpp>
> 
>-#include <vcl/sound.hxx>
> #include <basidesh.hxx>
> #include <basidesh.hrc>
> #include <baside2.hxx>
>diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
>index d0b6f22..4928473 100644
>--- a/basctl/source/basicide/brkdlg.cxx
>+++ b/basctl/source/basicide/brkdlg.cxx
>@@ -17,7 +17,6 @@
>  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
>  */
> 
>-#include <vcl/sound.hxx>
> 
> #define _SVX_NOIDERESIDS
> #include "breakpoint.hxx"
>diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
>index 64935bb..36cac99 100644
>--- a/basctl/source/basicide/objdlg.cxx
>+++ b/basctl/source/basicide/objdlg.cxx
>@@ -32,7 +32,6 @@
> #include <svl/itemset.hxx>
> #include <vcl/msgbox.hxx>
> #include <vcl/taskpanelist.hxx>
>-#include <vcl/sound.hxx>
> 
> ObjectCatalog::ObjectCatalog( Window * pParent )
>     :BasicDockingWindow( pParent, IDEResId( RID_BASICIDE_OBJCAT ) )
>diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
>index 5dcdfce..3b511b2 100644
>--- a/basic/source/runtime/methods.cxx
>+++ b/basic/source/runtime/methods.cxx
>@@ -22,7 +22,6 @@
> #include <osl/process.h>
> #include <vcl/svapp.hxx>
> #include <vcl/settings.hxx>
>-#include <vcl/sound.hxx>
> #include <tools/wintypes.hxx>
> #include <vcl/msgbox.hxx>
> #include <basic/sbx.hxx>
>diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
>index 2e3e7c9..bd31d8b 100644
>--- a/basic/source/sbx/sbxobj.cxx
>+++ b/basic/source/sbx/sbxobj.cxx
>@@ -18,7 +18,6 @@
>  */
> 
> #include <tools/stream.hxx>
>-#include <vcl/sound.hxx>
> #include <basic/sbx.hxx>
> #include "sbxres.hxx"
> #include <svl/brdcst.hxx>
>diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
>index 40f7302..497a210 100644
>--- a/cui/source/dialogs/colorpicker.cxx
>+++ b/cui/source/dialogs/colorpicker.cxx
>@@ -49,7 +49,6 @@
> #include <vcl/field.hxx>
> #include <vcl/bmpacc.hxx>
> #include <vcl/decoview.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> 
> #include <toolkit/helper/vclunohelper.hxx>
>diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
>index 4587092..71c3ae4 100644
>--- a/cui/source/dialogs/cuicharmap.cxx
>+++ b/cui/source/dialogs/cuicharmap.cxx
>@@ -29,7 +29,6 @@
> #include <stdio.h>
> 
> #include <tools/shl.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> #include <svtools/colorcfg.hxx>
> #include <svl/eitem.hxx>
>@@ -476,9 +475,7 @@ IMPL_LINK_NOARG(SvxCharMapData, CharSelectHdl)
>     {
>         String aText = aShowText.GetText();
> 
>-        if ( aText.Len() == CHARMAP_MAXLEN )
>-            Sound::Beep( SOUND_WARNING );
>-        else
>+        if ( aText.Len() != CHARMAP_MAXLEN )
>         {
>             sal_UCS4 cChar = aShowSet.GetSelectCharacter();
>             // using the new UCS4 constructor
>diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
>index b9e2bc9..263102d 100644
>--- a/cui/source/dialogs/cuitbxform.cxx
>+++ b/cui/source/dialogs/cuitbxform.cxx
>@@ -25,7 +25,6 @@
> #include <sfx2/dispatch.hxx>
> #include <vcl/toolbox.hxx>
> #include <vcl/fixed.hxx>
>-#include <vcl/sound.hxx>
> #include <dialmgr.hxx>
> #include <cuires.hrc>
> #include "cuitbxform.hxx"
>diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
>index 0a46fae..d97398d6 100644
>--- a/formula/source/ui/dlg/funcutl.cxx
>+++ b/formula/source/ui/dlg/funcutl.cxx
>@@ -17,7 +17,6 @@
>  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
>  */
> 
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/scrbar.hxx>
> 
>diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
>index a315f3c..7d993e9 100644
>--- a/sc/source/core/data/documen4.cxx
>+++ b/sc/source/core/data/documen4.cxx
>@@ -28,7 +28,6 @@
> 
> #include <svl/intitem.hxx>
> #include <svl/zforlist.hxx>
>-#include <vcl/sound.hxx>
> #include <formula/token.hxx>
> 
> #include "document.hxx"
>diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
>index 5721c88..05d1649 100644
>--- a/sc/source/ui/app/inputhdl.cxx
>+++ b/sc/source/ui/app/inputhdl.cxx
>@@ -52,7 +52,6 @@
> #include <sfx2/docfile.hxx>
> #include <sfx2/printer.hxx>
> #include <svl/zforlist.hxx>
>-#include <vcl/sound.hxx>
> #include <unotools/localedatawrapper.hxx>
> #include <vcl/help.hxx>
> #include <vcl/cursor.hxx>
>diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
>index 16aaed8..70d2456 100644
>--- a/sc/source/ui/docshell/docfunc.cxx
>+++ b/sc/source/ui/docshell/docfunc.cxx
>@@ -33,7 +33,6 @@
> #include <sfx2/linkmgr.hxx>
> #include <sfx2/bindings.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/virdev.hxx>
> #include <vcl/waitobj.hxx>
> #include <svl/PasswordHelper.hxx>
>diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
>index 54f1d7c..9d79456 100644
>--- a/sc/source/ui/docshell/olinefun.cxx
>+++ b/sc/source/ui/docshell/olinefun.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-#include <vcl/sound.hxx>
> #include <sfx2/bindings.hxx>
> 
> #include "olinefun.hxx"
>diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
>index e6e92cb..86bc545 100644
>--- a/sc/source/ui/navipi/content.cxx
>+++ b/sc/source/ui/navipi/content.cxx
>@@ -36,7 +36,6 @@
> #include <sfx2/docfile.hxx>
> #include <sfx2/viewfrm.hxx>
> #include <vcl/help.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> #include <tools/urlobj.hxx>
> #include <svl/urlbmk.hxx>
>diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
>index d89f87b..794ba05 100644
>--- a/sc/source/ui/navipi/navipi.cxx
>+++ b/sc/source/ui/navipi/navipi.cxx
>@@ -35,7 +35,6 @@
> #include <sfx2/navigat.hxx>
> #include <svl/stritem.hxx>
> #include <svl/urlbmk.hxx>
>-#include <vcl/sound.hxx>
> #include <unotools/charclass.hxx>
> #include <stdlib.h>
> 
>diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
>index 9882a40..3d175b7 100644
>--- a/sc/source/ui/view/dbfunc3.cxx
>+++ b/sc/source/ui/view/dbfunc3.cxx
>@@ -31,7 +31,6 @@
> #include <sfx2/bindings.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/waitobj.hxx>
> #include <svl/zforlist.hxx>
> #include <sfx2/app.hxx>
>diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
>index 305b24b..04524ec 100644
>--- a/sc/source/ui/view/editsh.cxx
>+++ b/sc/source/ui/view/editsh.cxx
>@@ -60,7 +60,6 @@
> #include <svtools/cliplistener.hxx>
> #include <svl/whiter.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <sot/formats.hxx>
> #include <svtools/transfer.hxx>
> #include <svl/stritem.hxx>
>diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
>index 3ef6eb1..295a0db 100644
>--- a/sc/source/ui/view/gridwin.cxx
>+++ b/sc/source/ui/view/gridwin.cxx
>@@ -46,7 +46,6 @@
> #include <svtools/svtabbx.hxx>
> #include <svl/urlbmk.hxx>
> #include <vcl/cursor.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/graph.hxx>
> #include <vcl/hatch.hxx>
> #include <sot/formats.hxx>
>diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
>index d569a49..3c3066e 100644
>--- a/sc/source/ui/view/gridwin2.cxx
>+++ b/sc/source/ui/view/gridwin2.cxx
>@@ -28,7 +28,6 @@
> 
> #include "scitems.hxx"
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> 
> #include "gridwin.hxx"
> #include "tabvwsh.hxx"
>diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
>index 8007e0e..a020540 100644
>--- a/sc/source/ui/view/preview.cxx
>+++ b/sc/source/ui/view/preview.cxx
>@@ -41,7 +41,6 @@
> #include <svl/itemset.hxx>
> #include <tools/multisel.hxx>
> #include <vcl/waitobj.hxx>
>-#include <vcl/sound.hxx>
> 
> #include "preview.hxx"
> #include "prevwsh.hxx"
>diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
>index 6536d5a..b680a87 100644
>--- a/sc/source/ui/view/select.cxx
>+++ b/sc/source/ui/view/select.cxx
>@@ -27,7 +27,6 @@
>  ************************************************************************/
> 
> #include <tools/urlobj.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> #include <sfx2/docfile.hxx>
> 
>diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
>index bc5cf50..f086ad6 100644
>--- a/sc/source/ui/view/tabcont.cxx
>+++ b/sc/source/ui/view/tabcont.cxx
>@@ -29,7 +29,6 @@
> #include <sfx2/viewfrm.hxx>
> #include <sfx2/dispatch.hxx>
> #include <sfx2/docfile.hxx>
>-#include <vcl/sound.hxx>
> #include <tools/urlobj.hxx>
> #include <vcl/svapp.hxx>
> #include "tabcont.hxx"
>diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
>index 3f941bc..642e999 100644
>--- a/sc/source/ui/view/tabvwshe.cxx
>+++ b/sc/source/ui/view/tabvwshe.cxx
>@@ -39,7 +39,6 @@
> #include <sfx2/request.hxx>
> #include <sfx2/objface.hxx>
> #include <svl/stritem.hxx>
>-#include <vcl/sound.hxx>
> 
> #include "tabvwsh.hxx"
> #include "sc.hrc"
>diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
>index fe524aa..b55e103 100644
>--- a/sc/source/ui/view/viewfun2.cxx
>+++ b/sc/source/ui/view/viewfun2.cxx
>@@ -45,7 +45,6 @@
> #include <svl/zforlist.hxx>
> #include <svx/svdview.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/waitobj.hxx>
> 
> #include <basic/sbstar.hxx>
>diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
>index 2b9c1f7..817b662 100644
>--- a/sc/source/ui/view/viewfun6.cxx
>+++ b/sc/source/ui/view/viewfun6.cxx
>@@ -32,7 +32,6 @@
> #include <sfx2/bindings.hxx>
> #include <sfx2/dispatch.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include "svl/zforlist.hxx"
> #include "svl/zformat.hxx"
> 
>diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
>index b55d508..888ff5c 100644
>--- a/sc/source/ui/view/viewfunc.cxx
>+++ b/sc/source/ui/view/viewfunc.cxx
>@@ -41,7 +41,6 @@
> #include <svl/zforlist.hxx>
> #include <svl/zformat.hxx>
> #include <vcl/msgbox.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/virdev.hxx>
> #include <vcl/waitobj.hxx>
> #include <vcl/wrkwin.hxx>
>diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
>index 82e02cc..6217c07 100644
>--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
>+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
>@@ -64,7 +64,6 @@
> #include "app.hrc"
> #include "sdresid.hxx"
> #include "strings.hrc"
>-#include <vcl/sound.hxx>
> #include <sfx2/viewfrm.hxx>
> #include <sfx2/dispatch.hxx>
> #include <svx/svdpagv.hxx>
>diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
>index 5988c53..4ee6df4 100644
>--- a/sfx2/source/appl/app.cxx
>+++ b/sfx2/source/appl/app.cxx
>@@ -33,7 +33,6 @@
> #include <basic/sbmod.hxx>
> #include <svtools/asynclink.hxx>
> #include <svl/stritem.hxx>
>-#include <vcl/sound.hxx>
> #include <svl/eitem.hxx>
> #include <svl/urlbmk.hxx>
> #include <vcl/msgbox.hxx>
>diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
>index aa365a5..db94288 100644
>--- a/sfx2/source/appl/appcfg.cxx
>+++ b/sfx2/source/appl/appcfg.cxx
>@@ -25,7 +25,6 @@
> #include <com/sun/star/util/XFlushable.hpp>
> 
> #include <stdlib.h>
>-#include <vcl/sound.hxx>
> #include <vcl/msgbox.hxx>
> #include <tools/string.hxx>
> #include <svl/itempool.hxx>
>diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
>index f19569b..ae48a48 100644
>--- a/sfx2/source/dialog/passwd.cxx
>+++ b/sfx2/source/dialog/passwd.cxx
>@@ -37,7 +37,6 @@
> #include "dialog.hrc"
> #include "passwd.hrc"
> 
>-#include "vcl/sound.hxx"
> #include "vcl/arrange.hxx"
> 
> // -----------------------------------------------------------------------
>@@ -61,7 +60,6 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
>         }
>         if( bReset )
>         {
>-            Sound::Beep( SOUND_ERROR );
>             pEdit->SetSelection( Selection( 0, nLen ) );
>             pEdit->ReplaceSelected( aFilter.makeStringAndClear() );
>         }
>diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
>index 92c4ba4..0cec1b9 100644
>--- a/starmath/source/dialog.cxx
>+++ b/starmath/source/dialog.cxx
>@@ -29,7 +29,6 @@
> #include <vcl/msgbox.hxx>
> #include <svtools/ctrltool.hxx>
> #include <sfx2/printer.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/help.hxx>
> #include <vcl/sndstyle.hxx>
> #include <vcl/waitobj.hxx>
>diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
>index d0b95b1..0112e8b 100644
>--- a/svtools/source/contnr/fileview.cxx
>+++ b/svtools/source/contnr/fileview.cxx
>@@ -73,7 +73,6 @@
> #include <osl/conditn.hxx>
> #include <salhelper/timer.hxx>
> #include <vcl/svapp.hxx>
>-#include <vcl/sound.hxx>
> #include <unotools/ucbhelper.hxx>
> #include <unotools/intlwrapper.hxx>
> #include <unotools/syslocale.hxx>
>diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
>index eff3939..17d3c98 100644
>--- a/svtools/source/contnr/svlbitm.cxx
>+++ b/svtools/source/contnr/svlbitm.cxx
>@@ -31,7 +31,6 @@
> #include <vcl/svapp.hxx>
> #include <vcl/button.hxx>
> #include <vcl/decoview.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/salnativewidgets.hxx>
> 
> struct SvLBoxButtonData_Impl
>diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
>index 481572b..40a6774 100644
>--- a/svtools/source/edit/textview.cxx
>+++ b/svtools/source/edit/textview.cxx
>@@ -36,7 +36,6 @@
> #include <vcl/cursor.hxx>
> #include <vcl/window.hxx>
> #include <vcl/svapp.hxx>
>-#include <vcl/sound.hxx>
> #include <tools/stream.hxx>
> 
> #include <sot/formats.hxx>
>diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx
>index 913053d..646377a 100644
>--- a/svx/inc/svx/galctrl.hxx
>+++ b/svx/inc/svx/galctrl.hxx
>@@ -29,7 +29,6 @@
> #include <vcl/menu.hxx>
> #include <vcl/edit.hxx>
> #include <vcl/combobox.hxx>
>-#include <vcl/sound.hxx>
> #include <svl/slstitm.hxx>
> #include <svtools/transfer.hxx>
> #include <svtools/valueset.hxx>
>diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
>index c675dd4..c93692b 100644
>--- a/svx/source/fmcomp/gridctrl.cxx
>+++ b/svx/source/fmcomp/gridctrl.cxx
>@@ -52,7 +52,6 @@
> #include <comphelper/extract.hxx>
> #include <tools/resid.hxx>
> #include <tools/diagnose_ex.h>
>-#include <vcl/sound.hxx>
> #include <vcl/menu.hxx>
> 
> #include "svx/fmresids.hrc"
>diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
>index 895d078..85c4f95 100644
>--- a/svx/source/form/fmexpl.cxx
>+++ b/svx/source/form/fmexpl.cxx
>@@ -61,7 +61,6 @@
> #include <tools/shl.hxx>
> 
> #include <vcl/wrkwin.hxx>
>-#include <vcl/sound.hxx>
> #include <svx/fmshell.hxx>
> #include "fmshimp.hxx"
> #include <svx/fmpage.hxx>
>diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
>index a39bb920..26c2da4 100644
>--- a/svx/source/form/fmshell.cxx
>+++ b/svx/source/form/fmshell.cxx
>@@ -77,7 +77,6 @@
> #include <svx/svdpagv.hxx>
> #include <sfx2/objitem.hxx>
> #include <sfx2/viewsh.hxx>
>-#include <vcl/sound.hxx>
> #include "fmexpl.hxx"
> #include "formcontrolling.hxx"
> #include <svl/numuno.hxx>
>diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
>index 0de29df..8ded160 100644
>--- a/svx/source/form/tbxform.cxx
>+++ b/svx/source/form/tbxform.cxx
>@@ -38,7 +38,6 @@
> #include "formtoolbars.hxx"
> 
> 
>-#include <vcl/sound.hxx>
> #include <svx/dialmgr.hxx>
> #include <svx/dialogs.hrc>
> #include "svx/tbxctl.hxx"
>diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
>index acbe3d9..1ec7028 100644
>--- a/svx/source/gengal/gengal.cxx
>+++ b/svx/source/gengal/gengal.cxx
>@@ -52,7 +52,6 @@
> #include <vcl/window.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/font.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/print.hxx>
> #include <vcl/toolbox.hxx>
> #include <vcl/help.hxx>
>diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
>index e10f315..5c388a7 100644
>--- a/svx/workben/edittest.cxx
>+++ b/svx/workben/edittest.cxx
>@@ -41,7 +41,6 @@
> #include <vcl/window.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/font.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/print.hxx>
> #include <vcl/toolbox.hxx>
> #include <vcl/help.hxx>
>diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
>index 9db8837..3f2e699 100644
>--- a/sw/source/core/doc/docedt.cxx
>+++ b/sw/source/core/doc/docedt.cxx
>@@ -30,7 +30,6 @@
> #include <string.h>         // for strchr()
> #include <hintids.hxx>
> 
>-#include <vcl/sound.hxx>
> #include <editeng/cscoitem.hxx>
> #include <editeng/brkitem.hxx>
> #include <linguistic/lngprops.hxx>
>@@ -179,8 +178,6 @@ void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, xub_StrLen &rStart )
>     {
>         // skip all special attributes
>         do {
>-            // "Beep" for every single one we skip
>-            Sound::Beep(SOUND_ERROR);
>             rIdx++;
>         } while( (rStart = rIdx.GetIndex()) < pNode->GetTxt().Len()
>                && !lcl_MayOverwrite(pNode, rStart) );
>diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
>index e2995ab..10377ba 100644
>--- a/sw/source/core/layout/paintfrm.cxx
>+++ b/sw/source/core/layout/paintfrm.cxx
>@@ -29,7 +29,6 @@
> 
> #include <com/sun/star/text/HoriOrientation.hpp>
> #include <hintids.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/lazydelete.hxx>
> #include <tools/poly.hxx>
> #include <svx/xoutbmp.hxx>
>diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
>index 5e3991d..ca99ba6 100644
>--- a/sw/source/core/text/frmpaint.cxx
>+++ b/sw/source/core/text/frmpaint.cxx
>@@ -29,7 +29,6 @@
> 
> #include <com/sun/star/text/HoriOrientation.hpp>
> #include <hintids.hxx>
>-#include <vcl/sound.hxx>
> #include <tools/shl.hxx> // SW_MOD
> #include <editeng/pgrditem.hxx>
> #include <editeng/lrspitem.hxx>
>diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
>index 70c27f2..6f920f1 100644
>--- a/sw/source/ui/dochdl/swdtflvr.cxx
>+++ b/sw/source/ui/dochdl/swdtflvr.cxx
>@@ -104,7 +104,6 @@
> #include <ndole.hxx>
> #include <swwait.hxx>
> #include <viewopt.hxx>
>-#include <vcl/sound.hxx>
> #include <swerror.h>
> #include <SwCapObjType.hxx>
> #include <cmdid.h>
>diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
>index 6d2d632..8e6ea32 100644
>--- a/sw/source/ui/utlui/content.cxx
>+++ b/sw/source/ui/utlui/content.cxx
>@@ -33,7 +33,6 @@
> #include <sfx2/dispatch.hxx>
> #include <vcl/help.hxx>
> #include <sot/formats.hxx>
>-#include <vcl/sound.hxx>
> #include <uiitems.hxx>
> #include <fmtinfmt.hxx>
> #include <txtinet.hxx>
>diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
>index 2de18ed..ff843d6 100644
>--- a/sw/source/ui/wrtsh/wrtsh1.cxx
>+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
>@@ -43,7 +43,6 @@
> #include <svx/svdview.hxx>
> #include <sot/factory.hxx>
> #include <svl/itemiter.hxx>
>-#include <vcl/sound.hxx>
> #include <tools/bigint.hxx>
> #include <sot/storage.hxx>
> #include <svtools/insdlg.hxx>
>diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
>index 4079e3a..77717fd 100644
>--- a/vcl/Library_vcl.mk
>+++ b/vcl/Library_vcl.mk
>@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
>     vcl/source/app/session \
>     vcl/source/app/settings \
>     vcl/source/app/solarmutex \
>-    vcl/source/app/sound \
>     vcl/source/app/stdtext \
>     vcl/source/app/svapp \
>     vcl/source/app/svdata \
>diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
>index 4363ad0..0da4b14 100644
>--- a/vcl/Package_inc.mk
>+++ b/vcl/Package_inc.mk
>@@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx)
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx))
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
>-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
> $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
>diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
>index b1d53b4..1d76e13 100644
>--- a/vcl/inc/vcl/msgbox.hxx
>+++ b/vcl/inc/vcl/msgbox.hxx
>@@ -71,7 +71,6 @@ protected:
>     FixedImage*         mpFixedImage;
>     XubString           maMessText;
>     Image               maImage;
>-    sal_uInt16              mnSoundType;
>     sal_Bool                mbHelpBtn;
>     CheckBox*           mpCheckBox;
>     XubString           maCheckBoxText;
>diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
>deleted file mode 100644
>index 539e768..0000000
>--- a/vcl/inc/vcl/sound.hxx
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>-/*
>- * This file is part of the LibreOffice project.
>- *
>- * This Source Code Form is subject to the terms of the Mozilla Public
>- * License, v. 2.0. If a copy of the MPL was not distributed with this
>- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
>- *
>- * This file incorporates work covered by the following license notice:
>- *
>- *   Licensed to the Apache Software Foundation (ASF) under one or more
>- *   contributor license agreements. See the NOTICE file distributed
>- *   with this work for additional information regarding copyright
>- *   ownership. The ASF licenses this file to you under the Apache
>- *   License, Version 2.0 (the "License"); you may not use this file
>- *   except in compliance with the License. You may obtain a copy of
>- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
>- */
>-
>-#ifndef _SV_SOUND_HXX
>-#define _SV_SOUND_HXX
>-
>-#include <vcl/dllapi.h>
>-#include <vcl/sndstyle.hxx>
>-
>-class Window;
>-class Timer;
>-
>-// ---------
>-// - Sound -
>-// ---------
>-
>-class VCL_DLLPUBLIC Sound
>-{
>-public:
>-    static void         Beep( SoundType eType = SOUND_DEFAULT, Window* pWindow = NULL );
>-};
>-
>-#endif // _SV_SOUND_HXX
>-
>-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
>index 5603d4c..7f7ead5 100644
>--- a/vcl/source/app/dbggui.cxx
>+++ b/vcl/source/app/dbggui.cxx
>@@ -49,7 +49,6 @@
> #include "vcl/field.hxx"
> #include "vcl/msgbox.hxx"
> #include "vcl/wrkwin.hxx"
>-#include "vcl/sound.hxx"
> #include "vcl/threadex.hxx"
> 
> #include "svdata.hxx"
>@@ -1664,7 +1663,6 @@ void DbgPrintMsgBox( const char* pLine )
>         }
> #endif
> 
>-        Sound::Beep( SOUND_ERROR );
> #ifdef UNX
>         fprintf( stderr, "%s\n", pLine );
>         return;
>diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
>deleted file mode 100644
>index 498842c..0000000
>--- a/vcl/source/app/sound.cxx
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>-/*
>- * This file is part of the LibreOffice project.
>- *
>- * This Source Code Form is subject to the terms of the Mozilla Public
>- * License, v. 2.0. If a copy of the MPL was not distributed with this
>- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
>- *
>- * This file incorporates work covered by the following license notice:
>- *
>- *   Licensed to the Apache Software Foundation (ASF) under one or more
>- *   contributor license agreements. See the NOTICE file distributed
>- *   with this work for additional information regarding copyright
>- *   ownership. The ASF licenses this file to you under the Apache
>- *   License, Version 2.0 (the "License"); you may not use this file
>- *   except in compliance with the License. You may obtain a copy of
>- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
>- */
>-
>-
>-#include <vcl/svapp.hxx>
>-#include <vcl/window.hxx>
>-#include <vcl/sound.hxx>
>-
>-#include <salframe.hxx>
>-#include <svdata.hxx>
>-
>-void Sound::Beep( SoundType eType, Window* pWindow )
>-{
>-    // #i91990#
>-    if ( Application::IsHeadlessModeEnabled() )
>-        return;
>-
>-    if ( !pWindow )
>-        pWindow = ImplGetDefaultWindow();
>-
>-    pWindow->ImplGetFrame()->Beep( eType );
>-}
>-
>-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
>index 43c324a..b30e275 100644
>--- a/vcl/source/control/field2.cxx
>+++ b/vcl/source/control/field2.cxx
>@@ -29,7 +29,6 @@
> #include <comphelper/string.hxx>
> #include <tools/rc.h>
> #include <vcl/svapp.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/event.hxx>
> #include <vcl/field.hxx>
> #include <vcl/unohelp.hxx>
>diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
>index 863b827..5851901 100644
>--- a/vcl/source/control/scrbar.cxx
>+++ b/vcl/source/control/scrbar.cxx
>@@ -28,7 +28,6 @@
> 
> 
> #include "vcl/event.hxx"
>-#include "vcl/sound.hxx"
> #include "vcl/decoview.hxx"
> #include "vcl/scrbar.hxx"
> #include "vcl/timer.hxx"
>@@ -970,8 +969,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
>                 meScrollType    = SCROLL_LINEUP;
>                 mnDragDraw      = SCRBAR_DRAW_BTN1;
>             }
>-            else
>-                Sound::Beep( SOUND_DISABLE, this );
>         }
>         else if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_BUTTON_RIGHT: PART_BUTTON_DOWN,
>                     aControlRegion, rMousePos, bIsInside )?
>@@ -984,8 +981,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
>                 meScrollType    = SCROLL_LINEDOWN;
>                 mnDragDraw      = SCRBAR_DRAW_BTN2;
>             }
>-            else
>-                Sound::Beep( SOUND_DISABLE, this );
>         }
>         else
>         {
>@@ -1028,8 +1023,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
>                     mnStateFlags |= SCRBAR_STATE_THUMB_DOWN;
>                     ImplDraw( mnDragDraw, this );
>                 }
>-                else
>-                    Sound::Beep( SOUND_DISABLE, this );
>             }
>             else if( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA,
>                                            aControlRegion, rMousePos, bIsInside )?
>diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
>index ab7ffd3..84d6e37 100644
>--- a/vcl/source/control/tabctrl.cxx
>+++ b/vcl/source/control/tabctrl.cxx
>@@ -38,7 +38,6 @@
> #include "vcl/tabpage.hxx"
> #include "vcl/tabctrl.hxx"
> #include "vcl/controllayout.hxx"
>-#include "vcl/sound.hxx"
> #include "vcl/lstbox.hxx"
> 
> #include "controldata.hxx"
>diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
>index cbc06c5..eb67b10 100644
>--- a/vcl/source/window/menu.cxx
>+++ b/vcl/source/window/menu.cxx
>@@ -41,7 +41,6 @@
> #include "vcl/floatwin.hxx"
> #include "vcl/wrkwin.hxx"
> #include "vcl/timer.hxx"
>-#include "vcl/sound.hxx"
> #include "vcl/decoview.hxx"
> #include "vcl/bitmap.hxx"
> #include "vcl/menu.hxx"
>diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
>index ad1d867..7d49f3e 100644
>--- a/vcl/source/window/msgbox.cxx
>+++ b/vcl/source/window/msgbox.cxx
>@@ -38,7 +38,6 @@
> #include <vcl/svapp.hxx>
> #include <vcl/wrkwin.hxx>
> #include <vcl/fixed.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/msgbox.hxx>
> #include <vcl/button.hxx>
> #include <vcl/mnemonic.hxx>
>@@ -69,7 +68,6 @@ void MessBox::ImplInitMessBoxData()
> {
>     mpFixedText         = NULL;
>     mpFixedImage        = NULL;
>-    mnSoundType         = 0;
>     mbHelpBtn           = sal_False;
>     mpCheckBox          = NULL;
>     mbCheck             = sal_False;
>@@ -415,8 +413,6 @@ void MessBox::StateChanged( StateChangedType nType )
>     if ( nType == STATE_CHANGE_INITSHOW )
>     {
>         ImplPosControls();
>-        if ( mnSoundType )
>-            Sound::Beep( (SoundType)(mnSoundType-1), this );
>     }
>     ButtonDialog::StateChanged( nType );
> }
>@@ -458,7 +454,6 @@ void InfoBox::ImplInitInfoBoxData()
>         SetText( Application::GetDisplayName() );
> 
>     SetImage( InfoBox::GetStandardImage() );
>-    mnSoundType = ((sal_uInt16)SOUND_INFO)+1;
> }
> 
> // -----------------------------------------------------------------------
>@@ -494,7 +489,6 @@ void WarningBox::ImplInitWarningBoxData()
>         SetText( Application::GetDisplayName() );
> 
>     SetImage( WarningBox::GetStandardImage() );
>-    mnSoundType = ((sal_uInt16)SOUND_WARNING)+1;
> }
> 
> // -----------------------------------------------------------------------
>@@ -540,7 +534,6 @@ void ErrorBox::ImplInitErrorBoxData()
>         SetText( Application::GetDisplayName() );
> 
>     SetImage( ErrorBox::GetStandardImage() );
>-    mnSoundType = ((sal_uInt16)SOUND_ERROR)+1;
> }
> 
> // -----------------------------------------------------------------------
>@@ -586,7 +579,6 @@ void QueryBox::ImplInitQueryBoxData()
>         SetText( Application::GetDisplayName() );
> 
>     SetImage( QueryBox::GetStandardImage() );
>-    mnSoundType = ((sal_uInt16)SOUND_QUERY)+1;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
>index 0f356a9..ac6a28d 100644
>--- a/vcl/source/window/syswin.cxx
>+++ b/vcl/source/window/syswin.cxx
>@@ -30,7 +30,6 @@
> 
> #include <vcl/svapp.hxx>
> #include <vcl/menu.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/event.hxx>
> #include <vcl/syswin.hxx>
>@@ -207,10 +206,7 @@ sal_Bool SystemWindow::Close()
>     else
>         nStyle = GetStyle();
>     if ( !(nStyle & WB_CLOSEABLE) )
>-    {
>-        Sound::Beep( SOUND_DISABLE, this );
>         return sal_False;
>-    }
> 
>     Hide();
> 
>diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
>index 75d0def..b89d311 100644
>--- a/vcl/source/window/toolbox.cxx
>+++ b/vcl/source/window/toolbox.cxx
>@@ -38,7 +38,6 @@
> #include <vcl/accel.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/help.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/spin.h>
> #include <vcl/toolbox.hxx>
> #include <vcl/bitmap.hxx>
>@@ -5204,7 +5203,6 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
>                 ImplToolItem *pItem = ImplGetItem( mnHighItemId );
>                 if( !pItem->mbEnabled )
>                 {
>-                    Sound::Beep( SOUND_DISABLE, this );
>                     bGrabFocusToDocument = sal_True;
>                 }
>             }
>diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
>index e35015f..31a2270 100644
>--- a/vcl/source/window/winproc.cxx
>+++ b/vcl/source/window/winproc.cxx
>@@ -36,7 +36,6 @@
> #include <vcl/unohelp.hxx>
> #include <vcl/timer.hxx>
> #include <vcl/event.hxx>
>-#include <vcl/sound.hxx>
> #include <vcl/settings.hxx>
> #include <vcl/svapp.hxx>
> #include <vcl/cursor.hxx>
>@@ -483,10 +482,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
>             }
> 
>             if ( nSVEvent == EVENT_MOUSEBUTTONDOWN )
>-            {
>-                Sound::Beep( SOUND_DISABLE, pChild );
>                 return 1;
>-            }
>             else
>             {
>                 // Set normal MousePointer for disabled windows
>@@ -1970,9 +1966,7 @@ void ImplHandleClose( Window* pWindow )
>     }
> 
>     // check whether close is allowed
>-    if ( !pWin->IsEnabled() || !pWin->IsInputEnabled() || pWin->IsInModalMode() )
>-        Sound::Beep( SOUND_DISABLE, pWin );
>-    else
>+    if ( pWin->IsEnabled() && pWin->IsInputEnabled() && !pWin->IsInModalMode() )
>     {
>         DelayedCloseEvent* pEv = new DelayedCloseEvent;
>         pEv->pWindow = pWin;
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 48549: 64387 | 64453 | 64931 | 64966