diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-10-09 21:13:25 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-20 17:13:45 +0100 |
| commit | 861086a21449acb168e52e4eab606692200d2622 (patch) | |
| tree | be5f0e8ab4f48949392632ab3802ee557d8e2757 /framework | |
| parent | coverity#1426738 Dereference null return value (diff) | |
| download | core-861086a21449acb168e52e4eab606692200d2622.tar.gz core-861086a21449acb168e52e4eab606692200d2622.zip | |
Related: tdf#79657 Different approach to disable the context menu
... in the overflow toolbar. Using ToolBoxMenuType::NONE
is wrong as it might affect the layout. Can be easily triggered
here by adding FloatWinPopupFlags::GrabFocus to StartPopupMode
(which likely will be needed to fully solve tdf#79657).
Another case was fixed in 91053763a7189c8ac03a59dc996e6333404f846e
("Fix sub-toolbar tearoff for .uno:ChooseControls"), but without
providing a solution for the context menu.
Change-Id: I4a0b4560fe49106613fa2337b5dd83eb7fa29f47
Reviewed-on: https://gerrit.libreoffice.org/46837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 842e1f06d067..5c69e7f0dac8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1560,7 +1560,6 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar, void ) pOverflowToolBar->SetOutStyle( pToolBar->GetOutStyle() ); m_aOverflowManager.set( new ToolBarManager( m_xContext, m_xFrame, OUString(), pOverflowToolBar ) ); m_aOverflowManager->FillOverflowToolbar( pToolBar ); - pOverflowToolBar->SetMenuType( ToolBoxMenuType::NONE ); ::Size aActSize( pOverflowToolBar->GetSizePixel() ); ::Size aSize( pOverflowToolBar->CalcWindowSizePixel() ); |