vcl/inc/win/saldata.hxx | 3 ---
vcl/source/app/scheduler.cxx | 1 -
vcl/win/app/salinst.cxx | 1 -
vcl/win/window/salframe.cxx | 19 -------------------
4 files changed, 24 deletions(-)
New commits:
commit 5944f8dc9a20c5c1cd450cd457bcc973f649b7ca
Author: Noel Grandin <noelgran...@collabora.co.uk>
AuthorDate: Wed Apr 12 12:42:50 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Apr 12 16:01:26 2023 +0200
mpMouseLeaveTimer has been dead
ever since it was added in
commit 8229967979d96bd01e63e2954b7af35a57d9e08c
Date: Thu Sep 20 15:23:39 2007 +0000
INTEGRATION: CWS os2port01 (1.2.2); FILE ADDED
2006/11/29 14:34:20 ydario 1.2.2.1: Initial OS/2 import.
Change-Id: Ic1bbf9f9167f9a7146f3c7d18b6fdb69c1f44e0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150275
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 2d20903d6157..c391086b30a1 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -91,7 +91,6 @@ public:
std::unique_ptr<BYTE[]> mpDitherHigh; // Dither mapping table
HHOOK mhSalObjMsgHook; // hook to get interesting
msg for SalObject
HWND mhWantLeaveMsg; // window handle, that
want a MOUSELEAVE message
- AutoTimer* mpMouseLeaveTimer; // Timer for MouseLeave
Test
WinSalInstance* mpInstance;
WinSalFrame* mpFirstFrame; // pointer of first frame
WinSalObject* mpFirstObject; // pointer of first object
window
@@ -201,8 +200,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 );
#define SAL_OBJECT_CHILDCLASSNAMEW L"SALOBJECTCHILD"
#define SAL_COM_CLASSNAMEW L"SALCOMWND"
-#define SAL_MOUSELEAVE_TIMEOUT 300
-
// wParam == bWait; lParam == 0
#define SAL_MSG_THREADYIELD (WM_USER+111)
// wParam == 0; lParam == nMS
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 7afdfd0846e6..098242fe6c70 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -160,7 +160,6 @@ next_priority:
|| !strcmp( pTask->GetDebugName(), "desktop::Desktop
m_firstRunTimer" )
|| !strcmp( pTask->GetDebugName(),
"DrawWorkStartupTimer" )
|| !strcmp( pTask->GetDebugName(),
"editeng::ImpEditEngine aOnlineSpellTimer" )
- || !strcmp( pTask->GetDebugName(), "ImplHandleMouseMsg
SalData::mpMouseLeaveTimer" )
|| !strcmp( pTask->GetDebugName(), "sc ScModule
IdleTimer" )
|| !strcmp( pTask->GetDebugName(),
"sd::CacheConfiguration maReleaseTimer" )
|| !strcmp( pTask->GetDebugName(),
"svtools::GraphicCache maReleaseTimer" )
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 3afb38c04648..3e2cc7a04754 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -256,7 +256,6 @@ SalData::SalData()
mpDitherHigh = nullptr; // Dither mapping table
mhSalObjMsgHook = nullptr; // hook to get interesting msg for SalObject
mhWantLeaveMsg = nullptr; // window handle, that want a MOUSELEAVE
message
- mpMouseLeaveTimer = nullptr; // Timer for MouseLeave Test
mpInstance = nullptr; // pointer of first instance
mpFirstFrame = nullptr; // pointer of first frame
mpFirstObject = nullptr; // pointer of first object window
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 7b88c3ab8a67..48a251c38e86 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -984,11 +984,6 @@ WinSalFrame::~WinSalFrame()
if ( pSalData->mhWantLeaveMsg == mhWnd )
{
pSalData->mhWantLeaveMsg = nullptr;
- if ( pSalData->mpMouseLeaveTimer )
- {
- delete pSalData->mpMouseLeaveTimer;
- pSalData->mpMouseLeaveTimer = nullptr;
- }
}
// remove windows properties
@@ -3185,15 +3180,6 @@ static bool ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
SendMessageW( pSalData->mhWantLeaveMsg, SAL_MSG_MOUSELEAVE, 0,
GetMessagePos() );
pSalData->mhWantLeaveMsg = hWnd;
- // Start MouseLeave-Timer
- if ( !pSalData->mpMouseLeaveTimer )
- {
- pSalData->mpMouseLeaveTimer = new AutoTimer(
"ImplHandleMouseMsg SalData::mpMouseLeaveTimer" );
- pSalData->mpMouseLeaveTimer->SetTimeout(
SAL_MOUSELEAVE_TIMEOUT );
- pSalData->mpMouseLeaveTimer->Start();
- // We don't need to set a timeout handler, because we test
- // for mouseleave in the timeout callback
- }
aMouseEvt.mnButton = 0;
nEvent = SalEvent::MouseMove;
}
@@ -3226,11 +3212,6 @@ static bool ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
}
}
pSalData->mhWantLeaveMsg = nullptr;
- if ( pSalData->mpMouseLeaveTimer )
- {
- delete pSalData->mpMouseLeaveTimer;
- pSalData->mpMouseLeaveTimer = nullptr;
- }
aMouseEvt.mnX = aPt.x;
aMouseEvt.mnY = aPt.y;
aMouseEvt.mnButton = 0;
