r18587 by fschmid - Fixed image scaling bug when ungrouping.

[scribus-commit]

Author: fschmid
Date: Sat Nov  9 08:24:04 2013
New Revision: 18587

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18587
Log:
Fixed image scaling bug when ungrouping.

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18587&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Nov  9 08:24:04 2013
@@ -15360,8 +15360,13 @@
 	item->setXYPos(nX, nY, true);
 	item->rotateBy(-gRot);
 	item->setLineWidth(item->lineWidth() * qMax(grScXi, grScYi));
-	item->setImageXScale(item->imageXScale() * grScXi);
-	item->setImageYScale(item->imageYScale() * grScYi);
+	if (!item->ScaleType)
+		item->AdjustPictScale();
+	else
+	{
+		item->setImageXScale(item->imageXScale() * grScXi);
+		item->setImageYScale(item->imageYScale() * grScYi);
+	}
 	if (item->asPathText())
 		item->updatePolyClip();
 	else