From 03b52b540549d6e5c61fd7c8c1bf05c43eac0ddd Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 2 Oct 2013 08:52:09 +0000 Subject: 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 --- sd/source/ui/view/drviews1.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/view') diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 54ea09a3cff0..2df556dd7413 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -114,9 +114,15 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) } -void DrawViewShell::Deactivate(sal_Bool /*bIsMDIActivate*/) +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