mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this should always be empty now

Browse Source 
Change-Id: I5849ce78407675150ca1fd96388a4569bcd14f4a
This commit is contained in:
Caolán McNamara
2016-09-27 16:09:57 +01:00
parent 4da7971812
commit 1aaba02faf
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vcl/source/window/menu.cxx
View File

@@ -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 )
{