[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - dictionaries sd/source

[Caolán McNamara]

 dictionaries                   |    2 +-
 sd/source/ui/view/drviews1.cxx |    4 ++--
 sd/source/ui/view/outlnvsh.cxx |    1 +
 sd/source/ui/view/viewshel.cxx |    3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e5726f0578223cdd2b706c73be931364c57d477c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 18 14:27:15 2013 +0100

    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
    
    (cherry picked from commit 4a578dc9c7b9c5697f624807790565c99ccb919d)
    Reviewed-on: https://gerrit.libreoffice.org/4974
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    
    Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/dictionaries b/dictionaries
index 9c0209d..60f4c3b 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9c0209d831365ff1a10d686a6519d42434ec8e8a
+Subproject commit 60f4c3b0227f18061387155c9831d761c659ce01
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 26ad764..e6ea485 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 80f8b3d..446c31f 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 19ab220..2117370 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()
 }