commit db26f712e1edfef6b61a324b146310be00aeb100
author Heiko Tietze <tietze.heiko@gmail.com> Fri Jul 15 11:18:07 2022 +0200
committer Maxim Monastirsky <momonasmon@gmail.com> Sun Jul 17 22:50:55 2022 +0200
tree d09c05fd54df4c5306deae70495a7a02696cc771
parent f87c7018fa5641eeecd788907ea66892514255a6

Resolves tdf#143688 - Allow detaching of sub-toolbars when locked

Change-Id: I36669d953eb9438df73256676e2dfbfe3c263031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137100
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>

vcl/source/window/dockmgr.cxx

diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index e71c7f4..f836ff2 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -813,8 +813,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
    ImplPreparePopupMode();

    // don't allow tearoff, if globally disabled
    if( !StyleSettings::GetDockingFloatsSupported() ||
        ( GetWindow()->GetType() == WindowType::TOOLBOX && ToolBox::AlwaysLocked() ) )
    if( !StyleSettings::GetDockingFloatsSupported() )
        nFlags &= ~FloatWinPopupFlags::AllowTearOff;

    // if the subtoolbar was opened via keyboard make sure that key events