diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-07 09:26:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-07 12:39:11 +0100 |
commit | 5404f75a2fa863b97bdf8432f647053f0bff726e (patch) | |
tree | 119d2cede534f5ce1173422df99a0e532d6a7a28 /sfx2/source/appl/workwin.cxx | |
parent | 39efec060719bb2654ba20844ba02429371a4ffb (diff) |
loplugin:collapseif in sdext..svx
Change-Id: I188d9e9b53e00acfbae3c7acd54de28f084c4b3f
Reviewed-on: https://gerrit.libreoffice.org/62985
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/appl/workwin.cxx')
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 69e29d2e6d83..26c211d644f8 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -658,11 +658,8 @@ void SfxWorkWindow::ArrangeChildren_Impl( bool bForce ) return; SvBorder aBorder; - if ( nChildren ) - { - if ( IsVisible_Impl() ) - aBorder = Arrange_Impl(); - } + if ( nChildren && IsVisible_Impl() ) + aBorder = Arrange_Impl(); // If the current application document contains a IPClient, then the // object through SetTopToolFramePixel has to be assigned the available // space. The object will then point to its UITools and sets the app border @@ -1288,11 +1285,8 @@ void SfxWorkWindow::UpdateChildWindows_Impl() if ( bCreate ) CreateChildWin_Impl( pCW, false ); - if ( !bAllChildrenVisible ) - { - if ( pCW->pCli ) - pCW->pCli->nVisible &= ~SfxChildVisibility::ACTIVE; - } + if ( !bAllChildrenVisible && pCW->pCli ) + pCW->pCli->nVisible &= ~SfxChildVisibility::ACTIVE; } else if ( pChildWin ) { @@ -1593,8 +1587,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, for ( n=0; n<aSortedList.size(); ++n ) { SfxChild_Impl *pChild = aChildren[aSortedList[n]]; - if ( pChild ) - if ( pChild->pWin == pWin ) + if ( pChild && pChild->pWin == pWin ) break; } |