sc/source/ui/drawfunc/fupoor.cxx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
New commits: commit 7a4a68e2515fa54e041004cf63042c1ead00d576 Author: Trent MacAlpine <tmac...@gmail.com> Date: Fri Jan 16 22:06:39 2015 -0500 fdo#88339 Fixed Calc constrained image movement Change-Id: Id4143e0a8410e6a9589f941c2bda83074eaf4844 Reviewed-on: https://gerrit.libreoffice.org/13975 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 979e7b6..d66a293 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -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;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits