diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-04 12:47:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-05 09:35:28 +0200 |
| commit | 8cb1c1ec2bd5a48e17fa6474336a3e1f7b092739 (patch) | |
| tree | 7ad6cfa538b7756834e6ffa4dd1cc06daf415be5 /sfx2 | |
| parent | remove unused HelpContext/Name/UCHAR/USHORT from .SDI files (diff) | |
| download | core-8cb1c1ec2bd5a48e17fa6474336a3e1f7b092739.tar.gz core-8cb1c1ec2bd5a48e17fa6474336a3e1f7b092739.zip | |
remove unused SlotId/Volatile from .SDI files
Change-Id: I29f039c2fec8433fa062c603b64afffa60e7b0d0
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 9e679b76c72b..843169fb91e7 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -75,7 +75,6 @@ static sal_uInt16 nTimeOut = 300; #define TIMEOUT_FIRST nTimeOut #define TIMEOUT_UPDATING 20 -#define TIMEOUT_IDLE 2500 typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap; @@ -505,9 +504,7 @@ void SfxBindings::Update { // Query Status const SfxSlotServer* pMsgServer = pDispatcher ? pCache->GetSlotServer(*pDispatcher, pImp->xProv) : nullptr; - if ( !pCache->IsControllerDirty() && - ( !pMsgServer || - !pMsgServer->GetSlot()->IsMode(SfxSlotMode::VOLATILE) ) ) + if ( !pCache->IsControllerDirty() ) { pImp->bInUpdate = false; InvalidateSlotsInMap_Impl(); @@ -1644,23 +1641,7 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer) pImp->nMsgPos = 0; - // check for volatile slots - bool bVolatileSlotsPresent = false; - for ( sal_uInt16 n = 0; n < nCount; ++n ) - { - SfxStateCache* pCache = (*pImp->pCaches)[n]; - const SfxSlotServer *pSlotServer = pCache->GetSlotServer(*pDispatcher, pImp->xProv); - if ( pSlotServer && pSlotServer->GetSlot()->IsMode(SfxSlotMode::VOLATILE) ) - { - pCache->Invalidate(false); - bVolatileSlotsPresent = true; - } - } - - if (bVolatileSlotsPresent) - pImp->aTimer.SetTimeout(TIMEOUT_IDLE); - else - pImp->aTimer.Stop(); + pImp->aTimer.Stop(); // Update round is finished pImp->bInNextJob = false; |