commit 2f13fcb67269f99b890f5bb4c63117805e375692
author diwanshu885 <dmittal885@gmail.com> Tue Nov 24 11:49:17 2020 +0530
committer Heiko Tietze <heiko.tietze@documentfoundation.org> Wed Nov 25 10:35:49 2020 +0100
tree c2583d1fead7c027c515f148e1a49922024bde66
parent 6993d5d0f1079fe720a7da004b70b57361c99fc6

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 <heiko.tietze@documentfoundation.org>

framework/source/uielement/toolbarmanager.cxx

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 2dceb5b..9515dad 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);