[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/ui/drawfunc/fupoor.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef9d28a3605b7e3e1e68212cc44f7379fd2f464a
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jan 20 21:33:23 2015 +0100

    it's unnecessary to obtain the marked object in move mode, fdo#88339 followup
    
    ... just to determine there's nothing to do in that case.
    
    Change-Id: Ic962a5420afc5216e750b7fb578a4844ab6fc54a

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index d66a293..ea7759e 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -339,12 +339,12 @@ bool FuPoor::doConstructOrthogonal() const
     }
 
     // Detect image and resize proportionally, but don't constrain movement by default
-    if (pView->AreObjectsMarked())
+    if (!bIsMoveMode && pView->AreObjectsMarked())
     {
         const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
         if (rMarkList.GetMarkCount() == 1)
         {
-            if (rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF && !bIsMoveMode)
+            if (rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF)
             {
                 return true;
             }