diff options
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshel.cxx | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index fe0f1dd598d8..f6eb20f545d5 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -114,9 +114,9 @@ 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. + ViewShell::Deactivate(bIsMDIActivate); } namespace diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index df93540db347..37e28e90846b 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -383,6 +383,7 @@ void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate ) // Links must be kept also on deactivated viewshell, to allow drag'n'drop // to function properly ViewShell::Deactivate( bIsMDIActivate ); + SfxShell::BroadcastContextForActivation(false); } /** diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 0da2ef2c6d7d..f27195fc69c0 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -403,8 +403,7 @@ void ViewShell::Deactivate(sal_Bool bIsMDIActivate) mpHorizontalRuler->SetActive(sal_False); if (mpVerticalRuler.get() != NULL) mpVerticalRuler->SetActive(sal_False); - - SfxShell::Deactivate(bIsMDIActivate); + // Do not forward to SfxShell::Deactivate() } |