From fdff4b60b6d4beabadab15a4fceb60cb84e542d8 Mon Sep 17 00:00:00 2001 From: Trent MacAlpine Date: Fri, 16 Jan 2015 22:06:39 -0500 Subject: fdo#88339 Fixed Calc constrained image movement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixed on master by commit# 7a4a68e2515fa54e041004cf63042c1ead00d576 Change-Id: Id4143e0a8410e6a9589f941c2bda83074eaf4844 Reviewed-on: https://gerrit.libreoffice.org/14022 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/ui/drawfunc/fupoor.cxx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'sc/source') diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 979e7b6e2cec..d66a293bcacf 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; -- cgit v1.2.3