diff options
| author | Andre Fischer <af@apache.org> | 2013-10-02 08:52:09 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2013-10-02 08:52:09 +0000 |
| commit | 520cc667c80cea6bb48422825250b72ff36bb4ef (patch) | |
| tree | 08ad06dc90f57158bc7ac116370fdb638b5360d4 /sd | |
| parent | 685921ea31de48e26ad33e8aab9c3053cc622a34 (diff) | |
123276: Properly forward Deactivate() call and still don't broadcast context change.
Notes
Notes:
merged as: 1732a91ee0d594234776c4efbb64c88ccadc8e33
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
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 |