diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-27 16:09:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-27 16:09:57 +0100 |
| commit | 1aaba02fafe0b9131c2cdeba3fb4ad9924da81be (patch) | |
| tree | c529fea71893744b4b2bbe4ac5fa635426031103 | |
| parent | 4da7971812b0a53ba80f7d9c29851c527488067d (diff) | |
this should always be empty now
Change-Id: I5849ce78407675150ca1fd96388a4569bcd14f4a
| -rw-r--r-- | vcl/source/window/menu.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 183d3311318d..4fca3158e4ea 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -3096,15 +3096,9 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl if (pWin->IsDisposed()) return 0; - // Restore focus (could already have been - // restored in Select) xFocusId = pWin->GetFocusId(); - if ( xFocusId != nullptr ) - { - pWin->SetFocusId( nullptr ); - pSVData->maWinData.mbNoDeactivate = false; - } - pWin->ImplEndPopupMode( FloatWinPopupEndFlags::NONE, xFocusId ); + assert(xFocusId == nullptr && "Focus should already be restored by MenuFloatingWindow::End"); + pWin->ImplEndPopupMode(FloatWinPopupEndFlags::NONE, xFocusId); if ( nSelectedId ) // then clean up .. ( otherwise done by TH ) { |