[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/source

[Libreoffice Gerrit user]

 sd/source/ui/animations/CustomAnimationList.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 91151d5b642e44330c18087ebe0493cfa59b967b
Author:     Brian Fraser <andthebrain at softfrog.ca>
AuthorDate: Mon Jan 7 09:30:14 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Tue Feb 12 10:55:34 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 <raykowj at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/67694
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index a4aa0644abe7..61e864b004a4 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -602,11 +602,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 #5: Cleanup (regardless of if we were target of drop or not)
-void CustomAnimationList::DragFinished( sal_Int8 nDropAction )
+// D'n'D #6: Cleanup (regardless of if we were target of drop or not)
+void CustomAnimationList::DragFinished( sal_Int8 /*nDropAction*/ )
 {
     mpDndEffectDragging = nullptr;
     mpDndEffectInsertBefore = nullptr;
@@ -615,7 +617,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)