diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-02 15:07:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-02 16:03:55 +0100 |
| commit | 9fec7c4e0d4fb4cf660d6304f8e11e47077f9ffa (patch) | |
| tree | 6a9c46df18068ece94aa88a5389cf98ce4e2937e /sd/source/ui/view | |
| parent | c1198cf209aa343575d0ebccde1053ac2909e67a (diff) | |
Revert "Resolves: fdo#66924 switching to master view is broken"
This reverts commit 4a578dc9c7b9c5697f624807790565c99ccb919d.
Diffstat (limited to 'sd/source/ui/view')
| -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 6d0db828eed5..54ea09a3cff0 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*/) { - ViewShell::Deactivate(bIsMDIActivate); + // Do not forward to ViewShell::Deactivate() to prevent a context change. } namespace diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5e2b20930012..a5b142f550b7 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -383,7 +383,6 @@ 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 188c97ce9ba2..079b8ce05e76 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -403,7 +403,8 @@ void ViewShell::Deactivate(sal_Bool bIsMDIActivate) mpHorizontalRuler->SetActive(sal_False); if (mpVerticalRuler.get() != NULL) mpVerticalRuler->SetActive(sal_False); - // Do not forward to SfxShell::Deactivate() + + SfxShell::Deactivate(bIsMDIActivate); } |