Resolves: #i123276# Properly forward Deactivate() call...

and still don't broadcast context change.

(cherry picked from commit 520cc667c80cea6bb48422825250b72ff36bb4ef)

Conflicts:
sd/source/ui/view/drviews1.cxx
sfx2/inc/sfx2/shell.hxx
sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
sfx2/source/control/shell.cxx
sfx2/source/sidebar/ContextChangeBroadcaster.cxx

Change-Id: I753009041a999bc31a0528e37f0a499897f311c5

2 files changed, 20 insertions, 1 deletions

diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 8ffef2ca3a2f..eaed943daa84 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1176,4 +1176,9 @@ void SfxShell::BroadcastContextForActivation (const bool bIsActivated)
    }
 }
 
+bool SfxShell::SetContextBroadcasterEnabled (const bool bIsEnabled)
+{
+    return pImp->maContextChangeBroadcaster.SetBroadcasterEnabled(bIsEnabled);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 0e40f352b1fb..57d820f1c2c1 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -32,7 +32,8 @@ namespace sfx2 { namespace sidebar {
 
 
 ContextChangeBroadcaster::ContextChangeBroadcaster (void)
-    : msContextName()
+    : msContextName(),
+      mbIsBroadcasterEnabled(true)
 {
 }
 
@@ -76,11 +77,24 @@ void ContextChangeBroadcaster::Deactivate (const cssu::Reference<css::frame::XFr
 
 
 
+bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled)
+{
+    const bool bWasEnabled (mbIsBroadcasterEnabled);
+    mbIsBroadcasterEnabled = bIsEnabled;
+    return bWasEnabled;
+}
+
+
+
+
 void ContextChangeBroadcaster::BroadcastContextChange (
     const cssu::Reference<css::frame::XFrame>& rxFrame,
     const ::rtl::OUString& rsModuleName,
     const ::rtl::OUString& rsContextName)
 {
+    if ( ! mbIsBroadcasterEnabled)
+        return;
+
     if (rsContextName.getLength() == 0)
         return;