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

[Caolán McNamara]

 sd/source/ui/animations/SlideTransitionPane.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit dbd7d7b329ffced9b1e52df6487dcfc46c40c5b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 21 14:33:57 2014 +0100

    Resolves: fdo#84417 restore focus window after preview
    
    regression due to changes of sd/source/ui/slideshow/slideshow.cxx
    in cc5518ca61b209408a9d5262bbdcc39efccdd72d
    
    commit cc5518ca61b209408a9d5262bbdcc39efccdd72d
    Author: Steve Yin <steve_y at apache.org>
    Date:   Thu Nov 28 12:09:19 2013 +0000
        Integrate branch of IAccessible2
    
    Change-Id: I6b399d68c1f3ef32b702135b981100a23760569b
    (cherry picked from commit 92360e7413daf35d6b3acf2e77cf3c6063c5f11f)
    Reviewed-on: https://gerrit.libreoffice.org/12062
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2e7f4db..8b85613 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -859,6 +859,8 @@ void SlideTransitionPane::applyToSelectedPages()
 {
     if( ! mbUpdatingControls )
     {
+        Window *pFocusWindow = Application::GetFocusWindow();
+
         ::sd::slidesorter::SharedPageSelection pSelectedPages( getSelectedPages());
         impl::TransitionEffect aEffect = getTransitionEffectFromControls();
         if( ! pSelectedPages->empty())
@@ -875,6 +877,9 @@ void SlideTransitionPane::applyToSelectedPages()
             else
                 stopEffects();
         }
+
+        if (pFocusWindow)
+            pFocusWindow->GrabFocus();
     }
 }