r16056 by jghali - #9555 : Width and Height not greyed out for locked objects

[scribus-commit]

Author: jghali
Date: Sat Dec  4 17:53:21 2010
New Revision: 16056

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16056
Log:
#9555 : Width and Height not greyed out for locked objects

Modified:
    branches/Version135/Scribus/scribus/propertiespalette.cpp

Modified: branches/Version135/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16056&path=/branches/Version135/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/propertiespalette.cpp (original)
+++ branches/Version135/Scribus/scribus/propertiespalette.cpp Sat Dec  4 17:53:21 2010
@@ -2168,8 +2168,6 @@
 	setXY(i->xPos(), i->yPos());
 	setBH(i->width(), i->height());
 	NoPrint->setChecked(!i->printEnabled());
-	setLocked(i->locked());
-	setSizeLocked(i->sizeLocked());
 	setFlippedH(i->imageFlippedH());
 	setFlippedV(i->imageFlippedV());
 	RoVal = i->rotation();
@@ -2357,6 +2355,8 @@
 		}
 	}
 	setXY(CurItem->xPos(), CurItem->yPos());
+	setLocked(i->locked());
+	setSizeLocked(i->sizeLocked());
 	setScaleAndOffset(i->imageXScale(), i->imageYScale(), i->imageXOffset(), i->imageYOffset());
 	setLineWidth(i->lineWidth());
 	setLIvalue(i->lineStyle(), i->lineEnd(), i->lineJoin());