summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-02-13 12:30:56 -0900
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-02-15 12:53:00 +0100
commitbf10acd917dab972b461960720cd044527e22f16 (patch)
tree99925d721c0edb3dc5421cd9be5b45cda49b7ce5
parent88ca1a6f75b1e94136e04e8dc65b98955d0e8aaf (diff)
tdf#115691 restore focus to sidebar animation panel after automatic...
preview Change-Id: If4af785a20ce0d36e2db4cefba80745e9f40dd35 Reviewed-on: https://gerrit.libreoffice.org/49744 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8ebd2f1ee3e6..c0c5cf887d2c 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2116,6 +2116,8 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
if ( !pPreset && ( ePathKind == PathKind::NONE ) )
return;
+ VclPtr<vcl::Window> xSaveFocusId = Window::SaveFocus();
+
EffectSequence::iterator aIter( maListSelection.begin() );
const EffectSequence::iterator aEnd( maListSelection.end() );
@@ -2140,6 +2142,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
createPath( ePathKind, aTargets, 0.0 );
updateMotionPathTags();
+ Window::EndSaveFocus(xSaveFocusId);
return;
}
@@ -2160,6 +2163,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
}
onPreview(false);
+ Window::EndSaveFocus(xSaveFocusId);
}
}