diff options
| author | merttumer <mert.tumer@collabora.com> | 2021-04-02 16:18:05 +0300 |
|---|---|---|
| committer | Mert Tumer <mert.tumer@collabora.com> | 2021-04-20 06:52:26 +0200 |
| commit | b18bff18785cc194f9918f6bdf000069523827ef (patch) | |
| tree | ff3fcbb5b90a5af07f4549006d80cdf3d072705b /sc | |
| parent | 7f26b1b47819754ed5461517300346961a5bbbe4 (diff) | |
lok: Pass object ord num in the uno command
When multiple objects' glue points collide the ordnum
will be used to decide which glue point to connect to
for the connectors. Without that the default logic chooses
the lowest ordered object which is searched and found in the object list
Change-Id: I64579d28bbe6cbd92bab745838fe2995585b6a3f
Signed-off-by: merttumer <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113517
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114032
Tested-by: Jenkins
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 90bf9f8e51cd..4a46f3d69c90 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -205,16 +205,17 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_MOVE_SHAPE_HANDLE: { const SfxItemSet *pArgs = rReq.GetArgs (); - if (pArgs && pArgs->Count () == 3) + if (pArgs && pArgs->Count () >= 3) { const SfxUInt32Item* handleNumItem = rReq.GetArg<SfxUInt32Item>(FN_PARAM_1); const SfxUInt32Item* newPosXTwips = rReq.GetArg<SfxUInt32Item>(FN_PARAM_2); const SfxUInt32Item* newPosYTwips = rReq.GetArg<SfxUInt32Item>(FN_PARAM_3); + const SfxInt32Item* OrdNum = rReq.GetArg<SfxInt32Item>(FN_PARAM_4); const sal_uLong handleNum = handleNumItem->GetValue(); const sal_uLong newPosX = convertTwipToMm100(newPosXTwips->GetValue()); const sal_uLong newPosY = convertTwipToMm100(newPosYTwips->GetValue()); - pView->MoveShapeHandle(handleNum, Point(newPosX, newPosY)); + pView->MoveShapeHandle(handleNum, Point(newPosX, newPosY), OrdNum ? OrdNum->GetValue() : -1); } } break; |