sd/source/ui/animations/CustomAnimationList.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit f0856d3c6115163da837c141b69ab017b8f1fd81
Author: Brian Fraser <andthebr...@softfrog.ca>
AuthorDate: Mon Jan 7 09:30:14 2019 -0800
Commit: Jim Raykowski <rayk...@gmail.com>
CommitDate: Thu Jan 10 22:20:52 2019 +0100
tdf#122454 Impress: Correct d'n'd animation selection in Windows
Change-Id: I0f17ff657beb2a5b3dfed91856ec45ddfca793a9
Reviewed-on: https://gerrit.libreoffice.org/65939
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <rayk...@gmail.com>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx
b/sd/source/ui/animations/CustomAnimationList.cxx
index c6878658c437..ec42796541f6 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -700,11 +700,13 @@ sal_Int8 CustomAnimationList::ExecuteDrop( const
ExecuteDropEvent& /*rEvt*/ )
ret = DND_ACTION_MOVE;
}
+ // NOTE: Don't call SvTreeListBox::ExecuteDrop(...) because all required
+ // move operations have been completed here to update the model.
return ret;
}
// D'n'D #6: Cleanup (regardless of if we were target of drop or not)
-void CustomAnimationList::DragFinished( sal_Int8 nDropAction )
+void CustomAnimationList::DragFinished( sal_Int8 /*nDropAction*/ )
{
mpDndEffectDragging = nullptr;
mpDndEffectInsertBefore = nullptr;
@@ -714,7 +716,9 @@ void CustomAnimationList::DragFinished( sal_Int8
nDropAction )
// Can hit this without running ExecuteDrop(...) when drag canceled.
mpMainSequence->rebuild();
- SvTreeListBox::DragFinished( nDropAction );
+ // Note: Don't call SvTreeListBox::DragFinished(...) because we don't call
+ // SvTreeListBox::ExecuteDrop(...) which sets variables that are
+ // needed in its DragFinished(...) method.
}
VCL_BUILDER_FACTORY(CustomAnimationList)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
