sd/source/ui/animations/CustomAnimationPane.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit dc7ae0c3647670b55347be8abe483423e77d11ee
Author: Brian Fraser <andthebr...@softfrog.ca>
AuthorDate: Tue Sep 18 12:53:37 2018 -0700
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Tue Oct 2 07:33:00 2018 +0200
Presurve rolled-up custom animation order when reordering
Fixes bug 119835
Change-Id: I3d2cb7f0e5d7d7c902878b77e64fa113b6e10c12
Reviewed-on: https://gerrit.libreoffice.org/60707
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 6fa5f9aefeb0..8277c4607802 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2385,7 +2385,12 @@ void CustomAnimationPane::moveSelection( bool bUp )
if( aInsertPos != rEffectSequence.end() )
{
++aInsertPos;
- while( (aInsertPos != rEffectSequence.end()) &&
!mpCustomAnimationList->isExpanded(*aInsertPos))
+ // Advance over rolled-up (un-expanded) items, unless we
just moved it there.
+ while( (aInsertPos != rEffectSequence.end())
+ && !mpCustomAnimationList->isExpanded(*aInsertPos)
+ && (std::find(maListSelection.begin(),
maListSelection.end(), *aInsertPos)
+ == maListSelection.end())
+ )
++aInsertPos;
rEffectSequence.insert( aInsertPos, pEffect );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
