diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-07-08 14:28:25 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-08 22:26:51 +0200 |
commit | 3175a7684982e7812e8071c595395eb3da3035fc (patch) | |
tree | de809b4f9776b05e1e945fdb5e01af0e067be5a8 /framework | |
parent | c109e1d1f5965fe03c666fee6c0bd4dd875f29c8 (diff) |
make SetParentToDefaultWindow available from vcl only
rechecked tdf#119390. If I tear off the color popdown in writer, click
in the combobox and shift-tab to put focus in the button (where focus is
more visible) and close the torn off window then focus continues to
return to the main document as wanted.
Change-Id: I1e909cdf31e9a1309475d933d0ede289a84884b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118645
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 0bd0d627ff9d..f08cfe60a6d8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -182,9 +182,6 @@ public: delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId )); } - // tdf#119390 this will reparent the toolbar, so focus is restored from a - // floating toolbar to the last focused control of the application window. - m_pToolBar->SetParentToDefaultWindow(); // #i93173# note we can still be in one of the toolbar's handlers m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() ); m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() ); |