summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index b6fe68308b9b..5ca1bb8daa69 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -234,8 +234,9 @@ void ToolBarManager::Destroy()
// Hide toolbar as lazy delete can destroy the toolbar much later.
m_pToolBar->Hide();
- /* #i99167# removed change for i93173 since there is some weird crash */
- // #i93173# delete toolbar lazily as we can still be in one of its handlers
+ // #i93173# delete toolbar lazily as we can still be in one of its handlers
+ // 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->doLazyDelete();
m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );