Kaydet (Commit) 7a4a68e2 authored tarafından Trent MacAlpine's avatar Trent MacAlpine Kaydeden (comit) Caolán McNamara

fdo#88339 Fixed Calc constrained image movement

Change-Id: Id4143e0a8410e6a9589f941c2bda83074eaf4844
Reviewed-on: https://gerrit.libreoffice.org/13975Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e8c0a297
......@@ -324,17 +324,30 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect)
}
}
// #i33136#
// #i33136# fdo#88339
bool FuPoor::doConstructOrthogonal() const
{
// Check whether an image is selected -> they should scale proportionally
// Detect whether we're moving an object or resizing.
bool bIsMoveMode = false;
if (pView->IsDragObj())
{
const SdrHdl* pHdl = pView->GetDragStat().GetHdl();
if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl()))
{
bIsMoveMode = true;
}
}
// Detect image and resize proportionally, but don't constrain movement by default
if (pView->AreObjectsMarked())
{
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if (rMarkList.GetMarkCount() == 1)
{
if (rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF)
if (rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF && !bIsMoveMode)
{
return true;
}
}
}
return false;
......
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