diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-18 14:27:15 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-19 07:48:17 +0000 |
| commit | 07cd8dd444620012d843b785c2243029a6d99944 (patch) | |
| tree | 079e5a1f7bcd8289473bd4235f0e38567ccd149a | |
| parent | 881bbc204f051f7b867c0579ec2a3428967e7468 (diff) | |
Resolves: fdo#66924 switching to master view is broken
It seems 0143805a565418d2a114c16b7eeba3b784176d9e wanted to not call
SfxShell::Activate from ViewShell::Activate and removed that call and added an
explicit SfxShell::BroadcastContextForActivation(true) (which is the body of
SfxShell::Activate) to OutlineViewShell::Activate for the case where it was
apparently wanted.
Then DrawViewShell::Deactivate had the call to ViewShell::Deactivate removed
persumably to avoid calling SfxShell::Deactivate via ViewShell::Deactivate
But with ViewShell::Deactivate omitted switching to master view is broken, it
does quite a lot more than call just SfxShell::Deactivate
Restore the call of ViewShell::Deactivate from DrawViewShell::Deactivate and
remove the call of SfxShell::Deactivate from ViewShell::Deactivate and put its
equivalent of SfxShell::BroadcastContextForActivation(false) into
OutlineViewShell::Deactivate to balance OutlineViewShell::Activate
regression since 0143805a565418d2a114c16b7eeba3b784176d9e
Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304
(cherry picked from commit 4a578dc9c7b9c5697f624807790565c99ccb919d)
Reviewed-on: https://gerrit.libreoffice.org/4974
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -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 26ad764b4fbe..e6ea48530a8d 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 80f8b3d6ed42..446c31ffa7c0 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 19ab22046487..21173704e0d5 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() } |