[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Jul 29 20:21:47 PDT 2012
binfilter/bf_basic/source/sbx/sbxobj.cxx | 1 -
binfilter/bf_sc/source/core/data/sc_documen4.cxx | 2 --
binfilter/bf_sc/source/core/data/sc_documen7.cxx | 10 ----------
binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx | 1 -
binfilter/bf_svtools/source/misc/svt_ehdl.cxx | 3 ---
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 3 ---
6 files changed, 20 deletions(-)
New commits:
commit b4f09b1d25687bc648231f9fd52528d7fd6a053c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 30 05:11:21 2012 +0200
fdo#48549 Remove Sound::Beep
Change-Id: I743a40b2a93546170a7cc350c4e761d2a52bb151
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 28c0664..078015b 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -18,7 +18,6 @@
*/
#include <tools/stream.hxx>
-#include <vcl/sound.hxx>
#include "sbx.hxx"
#include "sbxres.hxx"
diff --git a/binfilter/bf_sc/source/core/data/sc_documen4.cxx b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
index de6e817..1d84cde 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen4.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
@@ -23,7 +23,6 @@
#include <bf_svtools/intitem.hxx>
-#include <vcl/sound.hxx>
#include "globstr.hrc"
#include "subtotal.hxx"
@@ -114,7 +113,6 @@ namespace binfilter {
/*N*/ nTab1 = i;
/*N*/ if (i == MAXTAB + 1)
/*N*/ {
-/*N*/ Sound::Beep();
/*N*/ OSL_FAIL("ScDocument::InsertMatrixFormula Keine Tabelle markiert");
/*N*/ return;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen7.cxx b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
index 8939ba2..5d7b8c8 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen7.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
@@ -21,15 +21,6 @@
#pragma hdrstop
#endif
-
-
-#if defined( WNT ) && defined( erBEEP )
-#include <svwin.h>
-#define erBEEPER() Beep( 666, 66 )
-#else
-#define erBEEPER()
-#endif
-
#include "document.hxx"
#include "bcaslot.hxx"
#include "cell.hxx"
@@ -313,7 +304,6 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA
///*N*/ BOOL bWasWaiting = Application::IsWait();
///*N*/ if ( !bWasWaiting )
///*N*/ Application::EnterWait();
-/*N*/ erBEEPER();
/*N*/ ScBroadcasterList* pBC;
/*N*/ ScFormulaCell* pTrack;
/*N*/ ScFormulaCell* pNext;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
index e155d1e..f621378 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <tools/config.hxx>
-#include <vcl/sound.hxx>
#include <vcl/msgbox.hxx>
#include <bf_tools/string.hxx>
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index 5241b12..dc42cda 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -23,9 +23,6 @@
#include <tools/wintypes.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#if defined(OS2)
-#include <vcl/sound.hxx>
-#endif
#include <bf_svtools/ehdl.hxx>
#include <bf_svtools/svtdata.hxx>
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index 0f5c724..6fa856d 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <tools/debug.hxx>
-#include <vcl/sound.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <unotools/charclass.hxx>
@@ -515,7 +514,6 @@ BOOL SvNumberFormatter::PutEntry(String& rString,
sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey();
if (nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
{
- Sound::Beep();
OSL_FAIL("SvNumberFormatter:: Zu viele Formate pro CL");
delete p_Entry;
}
@@ -2591,7 +2589,6 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
nNewKey = nPos+1;
if (nPos - nCLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
{
- Sound::Beep();
OSL_FAIL(
"SvNumberFormatter:: Zu viele Formate pro CL");
delete pNewEntry;
More information about the Libreoffice-commits
mailing list