summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-21 21:48:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-22 09:39:17 +0100
commitf491382a868c3589bceece0ef34cf80d493f7c72 (patch)
tree7f5be2118c0f53a38d0338d1f21a9520fc7afd66 /sfx2
parent53f4837b92560d75eb6e629bebaf4e523ee40162 (diff)
remove else branches of if(1)
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/dispatch.cxx37
1 files changed, 8 insertions, 29 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index ef669db60e60..0b0b7c4cfcfe 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -529,22 +529,10 @@ void SfxDispatcher::Pop
if ( !pSfxApp->IsDowning() && pImp->aToDoStack.Count() )
{
- //! if (SFX_APP()->AnyInput(INPUT_KEYBOARD | INPUT_MOUSE) )
- //! AnyInput does not work, here a criterion has yet to found.
- //! As long as time after time with a timer.
- if (sal_True)
- {
- // No immediate update is requested
- pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
- pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
- pImp->aTimer.Start();
- }
- else
- {
- // Upgrade as quickly as possible(should be the normal case)
- pImp->aTimer.Stop();
- GetpApp()->PostUserEvent(pImp->nEventId, (void*)0);
- }
+ // No immediate update is requested
+ pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
+ pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ pImp->aTimer.Start();
}
else
{
@@ -796,19 +784,10 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
if ( pImp->aToDoStack.Count() )
{
- if (sal_True)
- {
- // No immediate update is requested
- pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
- pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
- pImp->aTimer.Start();
- }
- else
- {
- // Upgrade as quickly as possible(should be the normal case)
- pImp->aTimer.Stop();
- GetpApp()->PostUserEvent(pImp->nEventId, (void*)0);
- }
+ // No immediate update is requested
+ pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
+ pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ pImp->aTimer.Start();
}
}