r16855 by jghali - #10276: Undo/Redo with imagescaling breaks screen-rendering

[scribus-commit]

Author: jghali
Date: Thu Sep 22 22:06:50 2011
New Revision: 16855

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16855
Log:
#10276: Undo/Redo with imagescaling breaks screen-rendering

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

Modified: branches/Version135/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16855&path=/branches/Version135/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem.cpp Thu Sep 22 22:06:50 2011
@@ -2767,15 +2767,10 @@
 		if (freeScale != ScaleType)
 		{
 			ss->set("SCALE_TYPE", freeScale);
- 			if (!freeScale)
-			{
-				//if switching from free scaling to frame size
-				//in undo must be offset and scale saved
-				ss->set("OLD_IMAGEXOFFSET", LocalX);
-				ss->set("OLD_IMAGEYOFFSET", LocalY);
-				ss->set("OLD_IMAGEXSCALE", LocalScX);
-				ss->set("OLD_IMAGEYSCALE", LocalScY);
-			}
+			ss->set("OLD_IMAGEXOFFSET", LocalX);
+			ss->set("OLD_IMAGEYOFFSET", LocalY);
+			ss->set("OLD_IMAGEXSCALE", LocalScX);
+			ss->set("OLD_IMAGEYSCALE", LocalScY);
 		}
 		if (keepRatio != AspectRatio)
 			ss->set("ASPECT_RATIO", keepRatio);