commit c3c2ac6afad6b154d83dbe555f5b276e5909718b
author Jim Raykowski <raykowj@gmail.com> Thu Dec 20 23:43:39 2018 -0900
committer Noel Grandin <noel.grandin@collabora.co.uk> Sat Dec 29 07:25:21 2018 +0100
tree 441b08bc5fd5a327274f3b8c9a5a06d9ba0d611e
parent 5bdffc57b15be047dc19ff300957498465d004c5

tdf#115691 Keep focus in effects list after preview

Fixes gtk2 and gtk3 builds not keeping focus in effects list when
sidebar is undocked.

Change-Id: Iab2038bbf1ef2c1e6e1707f59776672d1b07404f
Reviewed-on: https://gerrit.libreoffice.org/65618
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sd/source/ui/animations/CustomAnimationPane.cxx

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index f87eb01..db2236a 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2092,8 +2092,6 @@
        if ( !pPreset && ( ePathKind == PathKind::NONE ) )
            return;

        VclPtr<vcl::Window> xSaveFocusId = Window::SaveFocus();

        if ( ePathKind != PathKind::NONE )
        {
            std::vector< Any > aTargets;
@@ -2114,7 +2112,6 @@

           createPath( ePathKind, aTargets, 0.0 );
           updateMotionPathTags();
           Window::EndSaveFocus(xSaveFocusId);
           return;
        }

@@ -2143,7 +2140,6 @@
        }

        onPreview(false);
        Window::EndSaveFocus(xSaveFocusId);
    }
}

sd/source/ui/slideshow/slideshow.cxx

diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index edbd197..dac5103 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1090,7 +1090,7 @@
            end();
        else
        {
            if(mpCurrentViewShellBase)
            if( mpCurrentViewShellBase && ( !mxCurrentSettings.get() || ( mxCurrentSettings.get() && !mxCurrentSettings->mbPreview ) ) )
                mpCurrentViewShellBase->GetWindow()->GrabFocus();
        }
    }