diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-04-21 07:50:54 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-04-21 11:02:29 +0200 |
| commit | de07f40030bbd604bc42d58f0e954cca284a2646 (patch) | |
| tree | d16090c7008b533b8af295b68701681012ba7608 /vcl/source | |
| parent | 3322661414a558d29146c40c0cd5e9db0a7b21dd (diff) | |
cppcheck: identicalInnerCondition
renamed temporary list in EnhancedCustomShape2d.cxx to avoid shadow
of a local variable
Change-Id: I17a2261dafd2067480fcc5314af4f48765d6b690
Reviewed-on: https://gerrit.libreoffice.org/53244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/event.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 6a9ed84cbaab..b344d7104fc6 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -629,11 +629,9 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, } if ( bCallActivate && ! pNewOverlapWindow->mpWindowImpl->mbActive ) { - if( ! pNewOverlapWindow->mpWindowImpl->mbActive ) - { - pNewOverlapWindow->mpWindowImpl->mbActive = true; - pNewOverlapWindow->Activate(); - } + pNewOverlapWindow->mpWindowImpl->mbActive = true; + pNewOverlapWindow->Activate(); + if ( pNewRealWindow != pNewOverlapWindow ) { if( ! pNewRealWindow->mpWindowImpl->mbActive ) |