vcl/inc/salwtype.hxx | 3 ---
vcl/source/window/winproc.cxx | 12 ------------
vcl/unx/generic/window/salframe.cxx | 2 --
vcl/win/source/window/salframe.cxx | 2 --
4 files changed, 19 deletions(-)
New commits:
commit 8314c3bda34102053905c751938984b5212b836f
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 13 11:01:51 2015 +0200
SALEVENT_ VOLUMECHANGED, DATETIMECHANGED and KEYBOARDCHANGED are unused
Change-Id: I9207b490cf0bc7fa6c0192cc3ad60d19eea89333
Reviewed-on: https://gerrit.libreoffice.org/14460
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 7a14df0..9b394c4 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -47,12 +47,9 @@ class FontSelectPattern;
#define SALEVENT_CLOSE ((sal_uInt16)12)
#define SALEVENT_SHUTDOWN ((sal_uInt16)13)
#define SALEVENT_SETTINGSCHANGED ((sal_uInt16)14)
-#define SALEVENT_VOLUMECHANGED ((sal_uInt16)15)
#define SALEVENT_PRINTERCHANGED ((sal_uInt16)16)
#define SALEVENT_DISPLAYCHANGED ((sal_uInt16)17)
#define SALEVENT_FONTCHANGED ((sal_uInt16)18)
-#define SALEVENT_DATETIMECHANGED ((sal_uInt16)19)
-#define SALEVENT_KEYBOARDCHANGED ((sal_uInt16)20)
#define SALEVENT_WHEELMOUSE ((sal_uInt16)21)
#define SALEVENT_USEREVENT ((sal_uInt16)22)
#define SALEVENT_MOUSEACTIVATE ((sal_uInt16)23)
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ec25267..79e3e0b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2108,9 +2108,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
DataChangedEventType nType;
switch ( nEvent )
{
- case SALEVENT_VOLUMECHANGED:
- nType = DataChangedEventType::NONE;
- break;
case SALEVENT_PRINTERCHANGED:
ImplDeletePrnQueueList();
nType = DataChangedEventType::PRINTER;
@@ -2122,12 +2119,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
OutputDevice::ImplUpdateAllFontData( true );
nType = DataChangedEventType::FONTS;
break;
- case SALEVENT_DATETIMECHANGED:
- nType = DataChangedEventType::NONE;
- break;
- case SALEVENT_KEYBOARDCHANGED:
- nType = DataChangedEventType::NONE;
- break;
default:
nType = DataChangedEventType::NONE;
break;
@@ -2478,12 +2469,9 @@ bool ImplWindowFrameProc( vcl::Window* pWindow,
SalFrame* /*pFrame*/,
}
case SALEVENT_SETTINGSCHANGED:
- case SALEVENT_VOLUMECHANGED:
case SALEVENT_PRINTERCHANGED:
case SALEVENT_DISPLAYCHANGED:
case SALEVENT_FONTCHANGED:
- case SALEVENT_DATETIMECHANGED:
- case SALEVENT_KEYBOARDCHANGED:
ImplHandleSalSettings( nEvent );
break;
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 77e70e7..4be773f 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4237,8 +4237,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
break;
case MappingNotify:
- if( MappingPointer != pEvent->xmapping.request )
- nRet = CallCallback( SALEVENT_KEYBOARDCHANGED, 0 );
break;
case ColormapNotify:
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 13c273a..1e0fb1a 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4074,8 +4074,6 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT
nMsg,
nSalEvent = SALEVENT_DISPLAYCHANGED;
else if ( nMsg == WM_FONTCHANGE )
nSalEvent = SALEVENT_FONTCHANGED;
- else if ( nMsg == WM_TIMECHANGE )
- nSalEvent = SALEVENT_DATETIMECHANGED;
else if ( nMsg == WM_WININICHANGE )
{
if ( lParam )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
