diff options
Diffstat (limited to 'vcl/source/window/menubarwindow.cxx')
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index d051bea37b12..553baa472ecb 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -325,14 +325,11 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) // when the frame is reactivated later //GrabFocus(); pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_NOHORZPLACEMENT, pMenu, bPreSelectFirst ); - if ( pActivePopup ) - { - // does not have a window, if aborted before or if there are no entries - if ( pActivePopup->ImplGetFloatingWindow() ) - pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow( this ); - else - pActivePopup = NULL; - } + // does not have a window, if aborted before or if there are no entries + if ( pActivePopup->ImplGetFloatingWindow() ) + pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow( this ); + else + pActivePopup = nullptr; } } } |