summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Package_inc.mk1
-rw-r--r--vcl/aqua/source/window/salframe.cxx15
-rw-r--r--vcl/headless/svpframe.cxx4
-rw-r--r--vcl/inc/aqua/salframe.h1
-rw-r--r--vcl/inc/headless/svpframe.hxx1
-rw-r--r--vcl/inc/ios/salframe.h1
-rw-r--r--vcl/inc/salframe.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/saldisp.hxx2
-rw-r--r--vcl/inc/unx/salframe.h1
-rw-r--r--vcl/inc/vcl/sndstyle.hxx40
-rw-r--r--vcl/inc/win/salframe.h1
-rw-r--r--vcl/ios/source/window/salframe.cxx15
-rw-r--r--vcl/source/app/dbggui.cxx2
-rw-r--r--vcl/unx/generic/app/saldisp.cxx7
-rw-r--r--vcl/unx/generic/window/salframe.cxx16
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx13
-rw-r--r--vcl/win/source/window/salframe.cxx18
18 files changed, 0 insertions, 143 deletions
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 0da4b14df2fd..a01822f46920 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
$(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/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 456bb919bf10..a80ff4e521ca 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1344,21 +1344,6 @@ const SystemEnvData* AquaSalFrame::GetSystemData() const
// -----------------------------------------------------------------------
-void AquaSalFrame::Beep( SoundType eSoundType )
-{
- switch( eSoundType )
- {
- case SOUND_DISABLE:
- // don't beep
- break;
- default:
- NSBeep();
- break;
- }
-}
-
-// -----------------------------------------------------------------------
-
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 208313de99c3..c6ca6c16631b 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -428,10 +428,6 @@ void SvpSalFrame::UpdateSettings( AllSettings& )
{
}
-void SvpSalFrame::Beep( SoundType )
-{
-}
-
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return &m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 50ec40723d3d..e51035aa22c3 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -147,7 +147,6 @@ public:
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index ac8683fcf502..e8613a8f0cba 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -115,7 +115,6 @@ public:
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h
index 46ff6fc17549..0c5c0b8ad008 100644
--- a/vcl/inc/ios/salframe.h
+++ b/vcl/inc/ios/salframe.h
@@ -143,7 +143,6 @@ public:
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index cd3f3b977575..30608cd8ed28 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -35,7 +35,6 @@
#ifdef __cplusplus
#include <vcl/ptrstyle.hxx>
-#include <vcl/sndstyle.hxx>
#endif // __cplusplus
#include <salwtype.hxx>
@@ -215,8 +214,6 @@ public:
virtual void UpdateSettings( AllSettings& rSettings ) = 0;
- virtual void Beep( SoundType eSoundType ) = 0;
-
// returns system data (most prominent: window handle)
virtual const SystemEnvData* GetSystemData() const = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 17d3e1209163..08ffa06cb1bc 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -396,8 +396,6 @@ public:
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
-
// returns system data (most prominent: window handle)
virtual const SystemEnvData* GetSystemData() const;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 0df988615987..96a51caa8adf 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -330,8 +330,6 @@ public:
void DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) const;
#endif
- void Beep() const;
-
void ModifierMapping();
void SimulateKeyPress( sal_uInt16 nKeyCode );
sal_uInt16 GetIndicatorState() const;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index cced9d6d9a23..71b1f5384e21 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -252,7 +252,6 @@ public:
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx
deleted file mode 100644
index 38be8cd844a3..000000000000
--- a/vcl/inc/vcl/sndstyle.hxx
+++ /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 .
- */
-
-#ifndef _SV_SNDSTYLE_HXX
-#define _SV_SNDSTYLE_HXX
-
-#include <tools/solar.h>
-
-// ---------------
-// - Sound-Types -
-// ---------------
-
-typedef sal_uInt16 SoundType;
-#define SOUND_DEFAULT ((SoundType)0)
-#define SOUND_INFO ((SoundType)1)
-#define SOUND_WARNING ((SoundType)2)
-#define SOUND_ERROR ((SoundType)3)
-#define SOUND_QUERY ((SoundType)4)
-
-#define SOUND_DISABLE ((SoundType)5)
-
-#endif // _SV_SNDSTYLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 0d4e206e8507..faaefbea24dc 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -130,7 +130,6 @@ public:
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index c86aa7d2ff42..2748f0a925e7 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -767,21 +767,6 @@ const SystemEnvData* IosSalFrame::GetSystemData() const
// -----------------------------------------------------------------------
-void IosSalFrame::Beep( SoundType eSoundType )
-{
- switch( eSoundType )
- {
- case SOUND_DISABLE:
- // don't beep
- break;
- default:
- // ???
- break;
- }
-}
-
-// -----------------------------------------------------------------------
-
void IosSalFrame::SetPosSize(long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 7f7ead52e4f7..d3b87da95f36 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1618,7 +1618,6 @@ long SolarMessageBoxExecutor::doIt()
#ifdef WNT
sal_Bool bOldCallTimer = pSVData->mbNoCallTimer;
pSVData->mbNoCallTimer = sal_True;
- MessageBeep( MB_ICONHAND );
nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.GetBuffer(), L"Debug Output",
MB_TASKMODAL | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_ICONSTOP );
pSVData->mbNoCallTimer = bOldCallTimer;
@@ -1655,7 +1654,6 @@ void DbgPrintMsgBox( const char* pLine )
// TODO: Shouldn't this be a IsDebuggerPresent()?
if ( GetSystemMetrics( SM_DEBUG ) )
{
- MessageBeep( MB_ICONHAND );
strcpy( aDbgOutBuf, pLine );
strcat( aDbgOutBuf, "\r\n" );
OutputDebugString( aDbgOutBuf );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index e9b4ba099e6e..a76d0351ca2f 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -673,13 +673,6 @@ void SalX11Display::SetupInput( SalI18N_InputMethod *pInputMethod )
SetKbdExtension( pKbdExtension );
}
-// Sound
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalDisplay::Beep() const
-{
- XBell( pDisp_, 0 );
-}
-
// Keyboard
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 0a76ff3169eb..9d744445bb14 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2633,22 +2633,6 @@ bool X11SalFrame::SetPluginParent( SystemParentData* pNewParent )
return true;
}
-// Sound
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::Beep( SoundType eSoundType ) // not fully suported
-{
- switch( eSoundType )
- {
- case SOUND_DEFAULT:
- case SOUND_ERROR:
- GetDisplay()->Beep();
- break;
- default:
- // Excessive beeping averted
- break;
- }
-}
-
// Event Handling
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
static sal_uInt16 sal_GetCode( int state )
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index d45a8f65545a..a6f8e0d44e01 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2477,19 +2477,6 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
ReleaseGraphics( pGraphics );
}
-void GtkSalFrame::Beep( SoundType eType )
-{
- switch( eType )
- {
- case SOUND_DEFAULT:
- case SOUND_ERROR:
- gdk_display_beep( getGdkDisplay() );
- break;
- default:
- break;
- }
-}
-
const SystemEnvData* GtkSalFrame::GetSystemData() const
{
return &m_aSystemData;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 2af53d3caf89..938a710f6017 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2931,23 +2931,6 @@ const SystemEnvData* WinSalFrame::GetSystemData() const
// -----------------------------------------------------------------------
-void WinSalFrame::Beep( SoundType eSoundType )
-{
- static UINT aImplSoundTab[5] =
- {
- 0, // SOUND_DEFAULT
- MB_ICONASTERISK, // SOUND_INFO
- MB_ICONEXCLAMATION, // SOUND_WARNING
- MB_ICONHAND, // SOUND_ERROR
- MB_ICONQUESTION // SOUND_QUERY
- };
-
- if( eSoundType != SOUND_DISABLE ) // don't beep on disable
- MessageBeep( aImplSoundTab[eSoundType] );
-}
-
-// -----------------------------------------------------------------------
-
SalFrame::SalPointerState WinSalFrame::GetPointerState()
{
SalPointerState aState;
@@ -4980,7 +4963,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam )
(!bMaximize && (nCommand == SC_MAXIMIZE)) ||
(bMaximize && (nCommand == SC_RESTORE)) )
{
- MessageBeep( 0 );
return TRUE;
}
}
generated by cgit (git 2.34.1) at 2025-02-26 15:15:16 +0000