Kaydet (Commit) f0856d3c authored tarafından Brian Fraser's avatar Brian Fraser Kaydeden (comit) Jim Raykowski

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: 's avatarJim Raykowski <raykowj@gmail.com>
üst 59fe75cd
...@@ -700,11 +700,13 @@ sal_Int8 CustomAnimationList::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) ...@@ -700,11 +700,13 @@ sal_Int8 CustomAnimationList::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
ret = DND_ACTION_MOVE; 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; return ret;
} }
// D'n'D #6: Cleanup (regardless of if we were target of drop or not) // 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; mpDndEffectDragging = nullptr;
mpDndEffectInsertBefore = nullptr; mpDndEffectInsertBefore = nullptr;
...@@ -714,7 +716,9 @@ void CustomAnimationList::DragFinished( sal_Int8 nDropAction ) ...@@ -714,7 +716,9 @@ void CustomAnimationList::DragFinished( sal_Int8 nDropAction )
// Can hit this without running ExecuteDrop(...) when drag canceled. // Can hit this without running ExecuteDrop(...) when drag canceled.
mpMainSequence->rebuild(); 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) VCL_BUILDER_FACTORY(CustomAnimationList)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment