diff options
| author | Brian Fraser <andthebrain@softfrog.ca> | 2019-01-07 09:30:14 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2019-01-10 22:20:52 +0100 |
| commit | f0856d3c6115163da837c141b69ab017b8f1fd81 (patch) | |
| tree | 2686aa026d3a945035a247cfad0bf43354fdd63e /sd | |
| parent | 59fe75cd7baab2f0c025576413cf8788ac258842 (diff) | |
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@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
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) |