diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f87eb0153538..db2236ad32a5 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2092,8 +2092,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) if ( !pPreset && ( ePathKind == PathKind::NONE ) ) return; - VclPtr<vcl::Window> xSaveFocusId = Window::SaveFocus(); - if ( ePathKind != PathKind::NONE ) { std::vector< Any > aTargets; @@ -2114,7 +2112,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) createPath( ePathKind, aTargets, 0.0 ); updateMotionPathTags(); - Window::EndSaveFocus(xSaveFocusId); return; } @@ -2143,7 +2140,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) } onPreview(false); - Window::EndSaveFocus(xSaveFocusId); } } 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(); } } |