summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-07-30 11:18:45 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-14 22:16:10 +0200
commitdc6e0f36962d8902a68a4b480f8698a0ae65f5a9 (patch)
tree56edd53f3855327b5a85ed8cf19d6eb55e676055
parent9286c2cf1fe5c91e8d7136308114fc9ab4b3e9eb (diff)
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@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx2
1 files changed, 2 insertions, 0 deletions
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;