summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-12-20 23:43:39 -0900
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-12-29 07:25:21 +0100
commitc3c2ac6afad6b154d83dbe555f5b276e5909718b (patch)
tree441b08bc5fd5a327274f3b8c9a5a06d9ba0d611e /sd/source/ui/slideshow
parent5bdffc57b15be047dc19ff300957498465d004c5 (diff)
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>
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index edbd197f4342..dac5103dceb2 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1090,7 +1090,7 @@ void SlideShow::StartInPlacePresentation()
end();
else
{
- if(mpCurrentViewShellBase)
+ if( mpCurrentViewShellBase && ( !mxCurrentSettings.get() || ( mxCurrentSettings.get() && !mxCurrentSettings->mbPreview ) ) )
mpCurrentViewShellBase->GetWindow()->GrabFocus();
}
}