From f491382a868c3589bceece0ef34cf80d493f7c72 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 21 Aug 2011 21:48:09 +0100 Subject: remove else branches of if(1) --- sfx2/source/control/dispatch.cxx | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) (limited to 'sfx2') 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(); } } -- cgit