diff options
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 |
2 files changed, 1 insertions, 2 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() ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c636b4023be0..f181da0a99d9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1718,7 +1718,7 @@ IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, void*, void) void ToolBox::ExecuteCustomMenu( const tools::Rectangle& rRect ) { - if( IsMenuEnabled() ) + if ( IsMenuEnabled() && !ImplIsInPopupMode() ) { UpdateCustomMenu(); // handle custom menu asynchronously |