From 520cc667c80cea6bb48422825250b72ff36bb4ef Mon Sep 17 00:00:00 2001
From: Andre Fischer <af@apache.org>
Date: Wed, 2 Oct 2013 08:52:09 +0000
Subject: 123276: Properly forward Deactivate() call and still don't broadcast
 context change.

---
 sd/source/ui/view/drviews1.cxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 56343c52ca00..6dbb4c855611 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -53,7 +53,6 @@
 #include <svx/fmglob.hxx>
 #include <editeng/outliner.hxx>
 
-
 #include "misc.hxx"
 
 #ifdef STARIMAGE_AVAILABLE
@@ -148,7 +147,13 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
 
 void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
 {
-    // Do not forward to ViewShell::Deactivate() to prevent a context change.
+    // Temporarily disable context broadcasting while the Deactivate()
+    // call is forwarded to our base class.
+    const bool bIsContextBroadcasterEnabled (SfxShell::SetContextBroadcasterEnabled(false));
+
+    ViewShell::Deactivate(bIsMDIActivate);
+
+    SfxShell::SetContextBroadcasterEnabled(bIsContextBroadcasterEnabled);
 }
 
 namespace
-- 
cgit