From 364eaba8ef183d61a07f07efe58c2a6a485d6b0e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 23 Oct 2015 11:51:47 +0100 Subject: fix indent and simplify returns, no logic change aka, beat up on its corpse a bit Change-Id: Ia5b8d227083e8f4c1582bf13260e92331740aa82 --- svx/source/svdraw/svdpntv.cxx | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 542af57d081b..86ff0db48d85 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -259,27 +259,29 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) return; } + const SdrHint* pSdrHint = dynamic_cast(&rHint); + if (!pSdrHint) + return; + + SdrHintKind eKind = pSdrHint->GetKind(); + if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { - const SdrHint* pSdrHint = dynamic_cast(&rHint); - if (pSdrHint) { - SdrHintKind eKind=pSdrHint->GetKind(); - if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { - bool bObjChg=!mbSomeObjChgdFlag; // if true, evaluate for ComeBack timer - if (bObjChg) { - mbSomeObjChgdFlag=true; - maComeBackIdle.Start(); - } - } - if (eKind==HINT_PAGEORDERCHG) { - const SdrPage* pPg=pSdrHint->GetPage(); + bool bObjChg = !mbSomeObjChgdFlag; // if true, evaluate for ComeBack timer + if (bObjChg) + { + mbSomeObjChgdFlag=true; + maComeBackIdle.Start(); + } + } - if(pPg && !pPg->IsInserted()) - { - if(mpPageView && mpPageView->GetPage() == pPg) - { - HideSdrPage(); - } - } + if (eKind==HINT_PAGEORDERCHG) + { + const SdrPage* pPg=pSdrHint->GetPage(); + if (pPg && !pPg->IsInserted()) + { + if(mpPageView && mpPageView->GetPage() == pPg) + { + HideSdrPage(); } } } @@ -291,8 +293,6 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ InvalidateAllWin(); } - - IMPL_LINK_NOARG_TYPED(SdrPaintView, ImpComeBackHdl, Idle *, void) { if (mbSomeObjChgdFlag) { -- cgit