diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-07-30 11:18:45 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-07-30 19:38:31 +0200 |
| commit | 63ccc97e1699d90da2532e4294cdaff670ad1a3f (patch) | |
| tree | 6c21993268f51ac75830e17275da3274fd48b4e6 /sfx2 | |
| parent | 5c3ba8ae6bc2521b44a78b33e354fe906a74014e (diff) | |
tdf#126508 Fix crash when changing icon style
Regression from b58aa94f1f365c746135470bceb97cc182c289bc
Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
Reviewed-on: https://gerrit.libreoffice.org/76590
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 857f68d68b3d0092f109845cfd93482871a0793d)
Reviewed-on: https://gerrit.libreoffice.org/76613
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 24660ef3dc2f..fce4732706b5 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -681,6 +681,8 @@ void SidebarController::SwitchToDeck ( const DeckDescriptor& rDeckDescriptor, const Context& rContext) { + maFocusManager.Clear(); + const bool bForceNewDeck ((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0); const bool bForceNewPanels ((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0); mnRequestedForceFlags = SwitchFlag_NoForce; |