[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2a22138704888a6df3c5b094c9a76f729572440d
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Jul 30 11:18:45 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Aug 14 17:05:00 2019 +0200

    tdf#126508 Fix crash when changing icon style
    
    Regression from b58aa94f1f365c746135470bceb97cc182c289bc
    
    Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
    Reviewed-on: https://gerrit.libreoffice.org/76603
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 5ed199f58f69..301bcf43bb3c 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -653,6 +653,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;