r21496 by jghali - #14355: "Size is Locked" does not prevent resizing with Alt+Arrow Up <FirasH>

[scribus-commit]

Author: jghali
Date: Sun Nov  6 12:12:03 2016
New Revision: 21496

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21496
Log:
#14355: "Size is Locked" does not prevent resizing with Alt+Arrow Up <FirasH>

Modified:
    trunk/Scribus/scribus/canvasmode.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21496&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Sun Nov  6 12:12:03 2016
@@ -1569,7 +1569,7 @@
 						//CB If in EditContour mode, allow contour line to be scaled with arrow keys too
 						if(m_doc->nodeEdit.isContourLine())
 							m_view->TransformPoly(12, 0, resizeBy/unitGetRatioFromIndex(m_doc->unitIndex()));
-						else
+						else if (!currItem->sizeLocked())
 						{
 							if ((rotationFC > 0.0 && rotationFC < 45.0) || (rotationFC >= 315.0 && rotationFC <= 360.0))
 							{