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

[scribus-commit]

Author: jghali
Date: Sat Dec  4 17:48:09 2010
New Revision: 16054

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

Modified:
    trunk/Scribus/scribus/ui/propertiespalette.cpp

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16054&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sat Dec  4 17:48:09 2010
@@ -1755,8 +1755,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();
@@ -1958,6 +1956,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());