Resolves: #i122095# React asynchronously to context changes

In order to avoid problems in SFX2

(cherry picked from commit 61ed9eac0583e34a9b69f0a1adcc208509e336a1)

Change-Id: I375603a28e788ce9257be308dc09a589240d0e58

1 files changed, 5 insertions, 1 deletions

diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 38ce50b1a23c..4ae0f7d9ceef 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -107,9 +107,11 @@ private:
     ::boost::scoped_ptr<TabBar> mpTabBar;
     cssu::Reference<css::frame::XFrame> mxFrame;
     Context maCurrentContext;
+    Context maRequestedContext;
     ::rtl::OUString msCurrentDeckId;
     ::rtl::OUString msCurrentDeckTitle;
     AsynchronousCall maPropertyChangeForwarder;
+    AsynchronousCall maContextChangeUpdate;
     bool mbIsDeckClosed;
     /** Before the deck is closed the sidebar width is saved into this variable,
         so that it can be restored when the deck is reopended.
@@ -118,7 +120,9 @@ private:
     FocusManager maFocusManager;
 
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
-    void UpdateConfigurations (const Context& rContext);
+    /** Make maRequestedContext the current context.
+    */
+    void UpdateConfigurations (void);
     bool ArePanelSetsEqual (
         const SharedPanelContainer& rCurrentPanels,
         const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels);