summaryrefslogtreecommitdiff
path: root/vcl/source/window/accmgr.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-08 12:45:38 +0200
committerNoel Grandin <noel@peralex.com>2015-09-09 10:06:12 +0200
commit78b124143a3c2bd82984c1c06aa3265c211cef13 (patch)
treeb48ab1bf75f7b9d548bec8b1c0427d733cc48ecf /vcl/source/window/accmgr.cxx
parent6f4e11a95bcd7a591cb93d1a842bbc8ad1ed31c9 (diff)
convert Link<> to typed
Change-Id: I2f36a123662488ef5534f7bf0845d61e497fb0ec
Diffstat (limited to 'vcl/source/window/accmgr.cxx')
-rw-r--r--vcl/source/window/accmgr.cxx17
1 files changed, 4 insertions, 13 deletions
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 5bc762739c40..e855193ca7a2 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -60,7 +60,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
Accelerator* pSubAccel = pAccel->GetAccel( pAccel->GetItemId(i) );
for ( size_t j = 0, n = mpSequenceList->size(); j < n; ++j ) {
if ( (*mpSequenceList)[ j ] == pSubAccel ) {
- EndSequence( true );
+ EndSequence();
i = pAccel->GetItemCount();
break;
}
@@ -80,25 +80,17 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
}
}
-void ImplAccelManager::EndSequence( bool bCancel )
+void ImplAccelManager::EndSequence()
{
// are we in a list ?
if ( !mpSequenceList )
return;
- // call all deactivate-handler of the accelerators in the list
for ( size_t i = 0, n = mpSequenceList->size(); i < n; ++i )
{
Accelerator* pTempAccel = (*mpSequenceList)[ i ];
- bool bDel = false;
- pTempAccel->mbIsCancel = bCancel;
- pTempAccel->mpDel = &bDel;
- pTempAccel->Deactivate();
- if ( !bDel )
- {
- pTempAccel->mbIsCancel = false;
- pTempAccel->mpDel = NULL;
- }
+ pTempAccel->mbIsCancel = false;
+ pTempAccel->mpDel = NULL;
}
// delete sequence-list
@@ -222,7 +214,6 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
{
// first call activate/deactivate-Handler
pAccel->Activate();
- pAccel->Deactivate();
// define accelerator of the actual item
// and call the handler