From 2f13fcb67269f99b890f5bb4c63117805e375692 Mon Sep 17 00:00:00 2001 From: diwanshu885 Date: Tue, 24 Nov 2020 11:49:17 +0530 Subject: [PATCH] tdf#131441 Disable "UNDOCKTOOLBAR" when toolbar is locked Change-Id: I3a7fdf2fbde55a8ac4083f1fa8cd76e55718b2e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106476 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- framework/source/uielement/toolbarmanager.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 2dceb5bb1116..9515dad96cdf 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1538,7 +1538,10 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox const * pToolBar) pMenu->EnableItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false); Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); if( xDockable.is() ) + { pMenu->CheckItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked()); + pMenu->EnableItem(MENUITEM_TOOLBAR_UNDOCKTOOLBAR, !xDockable->isLocked()); + } } else pMenu->EnableItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false);