diff options
63 files changed, 2 insertions, 172 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 5f7fe56a4f9c..1eab598b789a 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 bf82724a8ca3..a5702c1f251b 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 c68585c89f1e..4de4d7785844 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 d0b6f22aae74..4928473542f7 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 64935bb8331e..36cac994d643 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 5dcdfceb54bb..3b511b2db6ec 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 2e3e7c991573..bd31d8b807b7 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 40f73027bb31..497a210bcf82 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 458709259dc5..71c3ae4fdfac 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 b9e2bc98339f..263102da1a3c 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 0a46fae41d93..d97398d6a7ad 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 a315f3cc6dc7..7d993e94faa8 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 5721c880d43e..05d1649d6fd7 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 16aaed8f8cb7..70d2456d6a49 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 54f1d7c5a94a..9d79456a4605 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 e6e92cbf4514..86bc5454203a 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 d89f87bd12cc..794ba05448a2 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 9882a403b47b..3d175b752638 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 305b24bc693f..04524ecf6020 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 3ef6eb1848f8..295a0db5b17b 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 d569a4942cd7..3c3066e6d07d 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 8007e0efaf6a..a0205408dbd5 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 6536d5a694d5..b680a8729407 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 bc5cf5062b41..f086ad693f6e 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 3f941bc7f45f..642e999a9f83 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 fe524aa2c09c..b55e1030cca6 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 2b9c1f703741..817b662faabe 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 b55d508b1268..888ff5c29f0f 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 82e02cc57039..6217c07fde2f 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 5988c530d6d1..4ee6df444ed1 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 aa365a508937..db94288714e9 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 f19569bd1942..ae48a4880212 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 92c4ba424b20..0cec1b93e145 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 d0b95b1ec42d..0112e8ba5d1b 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 eff3939a9062..17d3c9804901 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 481572b53e79..40a67743f4bb 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 913053d25d6e..646377a7836d 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 c675dd406e27..c93692bb9142 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 895d078798fb..85c4f95fcbe5 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 a39bb920a9c3..26c2da46f1d2 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 0de29dffbb2b..8ded160afde1 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 acbe3d986a14..1ec70287e9da 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 e10f315cb8ee..5c388a78c716 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 9db8837f7818..3f2e6992e36e 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 e2995ab8fecd..10377ba95811 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 5e3991dc853e..ca99ba6c2b45 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 3c3c49939af8..1c8aa4cf9b63 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 6d2d63236446..8e6ea32bb96a 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 2de18edd448f..ff843d6c83f7 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 4079e3a697c6..77717fde0a73 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 4363ad048c55..0da4b14df2fd 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 b1d53b43faf0..1d76e1370acb 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 539e7688b9b8..000000000000 --- 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 5603d4cefa34..7f7ead52e4f7 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 498842c2e7ec..000000000000 --- 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 43c324a628c2..b30e275da104 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 863b8274d621..585190153df4 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 ab7ffd387ff4..84d6e37f5dd7 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 cbc06c51e029..eb67b1039b9c 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 ad1d867b3fd8..7d49f3eb734b 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 0f356a91de87..ac6a28d78b48 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 75d0def6077d..b89d3118472c 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 e35015fb4f75..31a2270b728a 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; |